Browse Source

Merge branch 'hostfix_v0.4.0' of http://39.106.8.246:3003/BDTP/digital-delivery into hostfix_v0.4.0

lijie 3 years ago
parent
commit
33cb3ff55a

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java

@@ -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");
     }
 
     /**