修改

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java

@@ -162,8 +162,8 @@ public class EquipmentCategoryController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "设备八大类列表树", notes = "设备八大类列表树")
     @GetMapping(value = "/equipTree")
-    public ResponseModel<Object> equipTree(String type) {
-        return ResponseHelper.buildResponse(equipmentCategoryService.equipTree(type));
+    public ResponseModel<Object> equipTree(@RequestParam(value = "type",required = false) String type) {
+        return ResponseHelper.buildResponse( equipmentCategoryService.equipTree(type));
     }
 
 	/**

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -64,19 +64,17 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     public List<Map<String, Object>> equipTree(String type) {
         List<Map<String, Object>> menus = new ArrayList<>();
         Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
-        Map<String, String> getCode = EquipmentClassifityEnum.getCode;
-        if (!ValidationUtil.isEmpty(type)) {
-            String code = getCode.get(type);
-            if (!ValidationUtil.isEmpty(code)) {
-                List<Map<String, Object>> mapList = resourceJson.get(code);
-                for (Map map : mapList) {
-                    Map<String, Object> resultMap = new HashMap<>();
-                    resultMap.put("instanceName", map.get("name"));
-                    resultMap.put("instanceId", map.get("code"));
-                    menus.add(resultMap);
-                }
-            }
-
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        if (ValidationUtil.isEmpty(type)) {
+            mapList = resourceJson.get(EquipmentClassifityEnum.BDLS.getCode());
+        } else {
+            mapList = resourceJson.get(type);
+        }
+        for (Map map : mapList) {
+            Map<String, Object> resultMap = new HashMap<>();
+            resultMap.put("instanceName", map.get("name"));
+            resultMap.put("instanceId", map.get("code"));
+            menus.add(resultMap);
         }
         return menus;
     }
@@ -118,6 +116,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         page.setRecords(list);
         return page;
     }
+
     /**
      * 生成监管码和电梯96333识别码
      */