解决消防装备多展示类型树的问题

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -983,12 +983,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
     @Override
     public Object getEquipmentTypeAndCount(String bizOrgCode) {
-        if (redisUtils.hasKey(equipTypeAndCount + bizOrgCode)) {
-            return JSONArray.parseArray(
-                    JSONArray.toJSONString(redisUtils.get(equipTypeAndCount + bizOrgCode)), EquipmentCategory.class);
-        } else {
+//        if (redisUtils.hasKey(equipTypeAndCount + bizOrgCode)) {
+//            return JSONArray.parseArray(
+//                    JSONArray.toJSONString(redisUtils.get(equipTypeAndCount + bizOrgCode)), EquipmentCategory.class);
+//        } else {
             return refreshEquipmentTypeAndCount(bizOrgCode);
-        }
+       // }
     }
 
     @Override
@@ -998,7 +998,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             return null;
         }
         List<EquipmentCategory> equipmentTypeList = responseList.stream()
-                .filter(i -> !i.getCode().startsWith("2") && "2".equals(i.getIndustryCode()))
+                .filter(i -> !i.getCode().startsWith("2")  && "2".equals(i.getIndustryCode()))
+                .filter(m->!m.getCode().startsWith("9306") && "2".equals(m.getIndustryCode()))
                 .collect(Collectors.toList());
         List<EquipmentCategory> list = typeListTree(equipmentTypeList, bizOrgCode, SourceTypeEnum.EQUIPMENT);
         redisUtils.set(equipTypeAndCount + bizOrgCode, list, 86400);