|
@@ -176,7 +176,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
}else{
|
|
|
major.setChildren(systemCodes);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//系统下的设备类
|
|
|
if(CollUtil.isNotEmpty(systemEquipMap) && CollUtil.isNotEmpty(systemCodes)){
|
|
|
for (AdmObjectType systemType : systemCodes) {
|
|
@@ -439,7 +439,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
* @param request
|
|
|
*/
|
|
|
private void revertSortField(AdmDictQueryCriteria request){
|
|
|
- request.setOrders("showOrder asc, name desc");
|
|
|
+ request.setOrders("showOrder asc, name desc");
|
|
|
}
|
|
|
|
|
|
/**
|