|
@@ -295,7 +295,7 @@ 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
|
|
@@ -306,7 +306,7 @@ func getConfiguration(conditionName, conditionType string, entId int64) []map[st
|
|
|
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{}{
|