默认值处理

jyBXCore/rpc/service/operator.go

@@ -469,9 +469,9 @@ func getArea(entid, positionId int64, labelArr *[]map[string]interface{}) map[st
 				is_delete = 0  and    position_id=? and   ent_id=?
 		) t1 ON  t0.eid = t1.企业_ID 
 		WHERE 
-			(t1.行业要素值 IS NULL OR FIND_IN_SET(t0.INDUSTRY, t1.行业要素值)) AND 
-			(t1.地区要素值 IS NULL OR FIND_IN_SET(t0.REGION, t1.地区要素值)) AND 
-			(t1.中标标签要素值 IS NULL OR FIND_IN_SET(t0.WINNER_TAG, t1.中标标签要素值)) AND 
+			(t1.行业要素值 IS NULL OR  t1.行业要素值="null" OR FIND_IN_SET(t0.INDUSTRY, t1.行业要素值)) AND 
+			(t1.地区要素值 IS NULL OR  t1.地区要素值="null" OR FIND_IN_SET(t0.REGION, t1.地区要素值)) AND 
+			(t1.中标标签要素值 IS NULL OR  t1.中标标签要素值="null" OR FIND_IN_SET(t0.WINNER_TAG, t1.中标标签要素值)) AND 
 			(t1.经营单位要素值 IS NULL OR  t1.经营单位要素值="null"  or   FIND_IN_SET(t0.tagname2, t1.经营单位要素值)) AND 
 			(t0.STATUS = 1) 
 		GROUP BY area, city, district ORDER BY  area, city, district`, positionId, entid)
@@ -844,16 +844,16 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}, int64) {
 		region := gconv.String((*configData)[0]["region"])
 		winner_tag := gconv.String((*configData)[0]["winner_tag"])
 		industry := gconv.String((*configData)[0]["industry"])
-		if tagname != "" {
+		if tagname != "" && tagname != "null" {
 			filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"tagname":["%s"]}}`, strings.Join(strings.Split(tagname, ","), `","`)))
 		}
-		if region != "" {
+		if region != "" && tagname != "null" {
 			filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"region":["%s"]}}`, strings.Join(strings.Split(region, ","), `","`)))
 		}
-		if winner_tag != "" {
+		if winner_tag != "" && tagname != "null" {
 			filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"winner_tag":["%s"]}}`, strings.Join(strings.Split(winner_tag, ","), `","`)))
 		}
-		if industry != "" {
+		if industry != "" && tagname != "null" {
 			filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"industry":["%s"]}}`, strings.Join(strings.Split(industry, ","), `","`)))
 		}
 	}