瀏覽代碼

类型查询接口:查询设备类时修改返回结构为树形结构

linhuili 3 年之前
父節點
當前提交
25efd16347
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      src/main/java/com/persagy/proxy/adm/service/impl/AdmDictServiceImpl.java

+ 3 - 2
src/main/java/com/persagy/proxy/adm/service/impl/AdmDictServiceImpl.java

@@ -118,7 +118,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
             //查询专业下的系统
             content = buildDictTree(allMajor,majorSystemMap,null);
         }
-        if(AdmDictCategoryEnum.SYSTEM_EQUIP.getValue().equals(type)){
+        if(AdmDictCategoryEnum.SYSTEM_EQUIP.getValue().equals(type) || AdmDictCategoryEnum.EQUIPMENT.getValue().equals(type)){
             //查询系统下的设备类
             content = buildDictTree(systems,systemEquipMap,null);
         }
@@ -194,7 +194,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
      */
     private List<String> getDictBaseCategory(){
         List<String> category = new ArrayList<>();
-        category.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
+        //category.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
         category.add(AdmDictCategoryEnum.COMPONENT.getValue());
         category.add(AdmDictCategoryEnum.SYSTEM.getValue());
         category.add(AdmDictCategoryEnum.SPACE.getValue());
@@ -213,6 +213,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
         category.add(AdmDictCategoryEnum.MAJOR_SYSTEM_EQUIP.getValue());
         category.add(AdmDictCategoryEnum.EQUIPMENT_COMPONENT.getValue());
         category.add(AdmDictCategoryEnum.SYSTEM_EQUIP.getValue());
+        category.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
         return category;
     }