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

jyBXCore/api/internal/logic/operatorSearchLogic.go

@@ -47,6 +47,7 @@ func (l *OperatorSearchLogic) OperatorSearch(req *types.OperatorSearchReq) (resp
 		PositionId:   req.PositionId,
 		Order:        req.Order,
 		UserId:       req.UserId,
+		Industry:     req.Industry,
 	})
 	data := gconv.Map(gconv.UnsafeBytesToStr(res.Data))
 	return &types.CommonResp{

jyBXCore/rpc/internal/logic/operatorsearchlogic.go

@@ -38,6 +38,7 @@ func (l *OperatorSearchLogic) OperatorSearch(in *bxcore.OperatorSearchReq) (*bxc
 		TopType:      in.TopType,
 		PublishTime:  in.PublishTime,
 		SelectType:   in.SelectType,
+		Industry:     in.Industry,
 		Price:        in.Price,
 		Tagname:      in.Tagname,
 		Tagname1:     in.Tagname1,

jyBXCore/rpc/service/operator.go

@@ -290,28 +290,34 @@ func getGetCriteriaType(entId, positionId, tag int64) []map[string]interface{} {
 }
 func getConfiguration(conditionName, conditionType string, entId int64, positionId int64) ([]map[string]interface{}, map[string]interface{}) {
 	dataMap := make(map[string]interface{})
+	filedType := ""
+	if conditionType == "industry" {
+		filedType = "2"
+	} else {
+		filedType = "3"
+	}
 	data := IC.BiMysql.SelectBySql(`SELECT
-					DISTINCT b.name,b.element_value as code
+					DISTINCT b.name,b.code as code
 				FROM
-					customer_data_yys_permissions  a  INNER JOIN   customer_data_yys_permission_elements  b  
+					customer_data_yys_permissions  a  INNER JOIN   d_yys_analyze_dimensions  b  
 				on  
 				    a.position_id=?
 					and a.ent_id = ?
 					and a.is_delete = 0 
 					AND a.element_name = ?
-				and  FIND_IN_SET( b.element_value,a.element_value)	
-				and  b.element_field=?  order by  code `, positionId, entId, conditionName, conditionType)
+				and  FIND_IN_SET( b.code,a.element_value)	
+				and  b.type=?  order by  code `, positionId, entId, conditionName, filedType)
 	options := []map[string]interface{}{}
 	if data == nil {
 		return options, dataMap
 	}
 	if len(*data) == 0 {
 		data = IC.BiMysql.SelectBySql(`SELECT
-					DISTINCT name,element_value as  code
+					DISTINCT name,code as  code
 				FROM
-					customer_data_yys_permission_elements  where 
+					d_yys_analyze_dimensions  where 
 					ent_id = ?
-				and  element_field=? and  pcode!="" order by  code`, entId, conditionType)
+				and  type=?  order by  code`, entId, filedType)
 	}
 	if data != nil && len(*data) > 0 {
 		options = append(options, map[string]interface{}{