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

jyBXCore/rpc/service/operator.go

@@ -287,7 +287,7 @@ func getGetCriteriaType(entId, positionId, tag int64) []map[string]interface{} {
 }
 func getConfiguration(conditionName, conditionType string, entId int64) []map[string]interface{} {
 	data := IC.BiMysql.SelectBySql(`SELECT
-					DISTINCT b.name,b.element_value
+					DISTINCT b.name,b.element_value as code
 				FROM
 					customer_data_yys_permissions  a  INNER JOIN   customer_data_yys_permission_elements  b  
 				on  
@@ -295,18 +295,18 @@ func getConfiguration(conditionName, conditionType string, entId int64) []map[st
 					and a.is_delete = 0 
 					AND a.element_name = ?
 				and  FIND_IN_SET( b.element_value,a.element_value)	
-				and  b.element_field=?`, entId, conditionName, conditionType)
+				and  b.element_field=? order by  code `, entId, conditionName, conditionType)
 	options := []map[string]interface{}{}
 	if data == nil {
 		return options
 	}
 	if len(*data) == 0 {
 		data = IC.BiMysql.SelectBySql(`SELECT
-					DISTINCT name,element_value
+					DISTINCT name,element_value as  code
 				FROM
 					customer_data_yys_permission_elements  where 
 					ent_id = ?
-				and  element_field=? and  pcode!=""`, entId, conditionType)
+				and  element_field=? and  pcode!="" order by  code`, entId, conditionType)
 	}
 	if data != nil && len(*data) > 0 {
 		options = append(options, map[string]interface{}{