|
@@ -118,7 +118,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
|
|
|
content = buildDictTree(allMajor,majorSystemMap,null);
|
|
|
}
|
|
|
- if(AdmDictCategoryEnum.SYSTEM_EQUIP.getValue().equals(type) || AdmDictCategoryEnum.EQUIPMENT.getValue().equals(type)){
|
|
|
+ if(AdmDictCategoryEnum.SYSTEM_EQUIP.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.COMPONENT.getValue());
|
|
|
category.add(AdmDictCategoryEnum.SYSTEM.getValue());
|
|
|
category.add(AdmDictCategoryEnum.SPACE.getValue());
|
|
@@ -213,7 +213,6 @@ 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;
|
|
|
}
|
|
|
|