Merge branch 'dev_v1.1.63_wh' of BaseService/jyMicroservices into feature/v1.1.63

jyBXCore/rpc/service/operator.go

@@ -778,7 +778,7 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}, int64) {
 
 	}
 	//查看自己是否定制
-	/*configData := IC.BiMysql.SelectBySql(`SELECT
+	configData := IC.BiMysql.SelectBySql(`SELECT
 		MAX( CASE WHEN element_name = '行业' THEN element_value END ) AS industry,
 		MAX( CASE WHEN element_name = '运营商中标标签' THEN element_value END ) AS winner_tag,
 		MAX( CASE WHEN element_name = '地区' THEN element_value END ) AS region,
@@ -789,24 +789,24 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}, int64) {
 		is_delete = 0
 		AND position_id = ?
 		AND ent_id = ?`, operator.PositionId, operator.EntId)
-		if configData != nil && len(*configData) > 0 {
-			tagname := gconv.String((*configData)[0]["tagname"])
-			region := gconv.String((*configData)[0]["region"])
-			winner_tag := gconv.String((*configData)[0]["winner_tag"])
-			industry := gconv.String((*configData)[0]["industry"])
-			if tagname != "" {
-				filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"tagname":["%s"]}}`, strings.Join(strings.Split(tagname, ","), `","`)))
-			}
-			if region != "" {
-				filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"region":["%s"]}}`, strings.Join(strings.Split(region, ","), `","`)))
-			}
-			if winner_tag != "" {
-				filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"winner_tag":["%s"]}}`, strings.Join(strings.Split(winner_tag, ","), `","`)))
-			}
-			if industry != "" {
-				filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"industry":["%s"]}}`, strings.Join(strings.Split(industry, ","), `","`)))
-			}
-		}*/
+	if configData != nil && len(*configData) > 0 {
+		tagname := gconv.String((*configData)[0]["tagname"])
+		region := gconv.String((*configData)[0]["region"])
+		winner_tag := gconv.String((*configData)[0]["winner_tag"])
+		industry := gconv.String((*configData)[0]["industry"])
+		if tagname != "" {
+			filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"tagname":["%s"]}}`, strings.Join(strings.Split(tagname, ","), `","`)))
+		}
+		if region != "" {
+			filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"region":["%s"]}}`, strings.Join(strings.Split(region, ","), `","`)))
+		}
+		if winner_tag != "" {
+			filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"winner_tag":["%s"]}}`, strings.Join(strings.Split(winner_tag, ","), `","`)))
+		}
+		if industry != "" {
+			filterArr = append(filterArr, fmt.Sprintf(`{"terms":{"industry":["%s"]}}`, strings.Join(strings.Split(industry, ","), `","`)))
+		}
+	}
 	//es  sql拼接
 	queryStr := ""
 	orderStr := ""