行业默认值处理

jyBXCore/rpc/service/operator.go

@@ -288,18 +288,19 @@ func getGetCriteriaType(entId, positionId, tag int64) []map[string]interface{} {
 	}
 	return data
 }
-func getConfiguration(conditionName, conditionType string, entId int64) ([]map[string]interface{}, map[string]interface{}) {
+func getConfiguration(conditionName, conditionType string, entId int64, positionId int64) ([]map[string]interface{}, map[string]interface{}) {
 	dataMap := make(map[string]interface{})
 	data := IC.BiMysql.SelectBySql(`SELECT
 					DISTINCT b.name,b.element_value as code
 				FROM
 					customer_data_yys_permissions  a  INNER JOIN   customer_data_yys_permission_elements  b  
 				on  
-					a.ent_id = ?
+				    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 `, entId, conditionName, conditionType)
+				and  b.element_field=?  order by  code `, positionId, entId, conditionName, conditionType)
 	options := []map[string]interface{}{}
 	if data == nil {
 		return options, dataMap