提交

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -620,9 +620,18 @@ public class FireFightingSystemController extends AbstractBaseController {
         for (int i = 0; i < result.length; i++) {
             map.put(i, Integer.valueOf(result[i]));
         }
+
+
         if (StringUtil.isNotEmpty(equipTypeAmountPage.getEquipmentClassificationCode())) {
+            EquipmentCategory equipmentCategory = equipmentCategoryService.getById(equipTypeAmountPage.getEquipmentClassificationCode());
             QueryWrapper<EquipmentCategory> equipmentCategoryQueryWrapper = new QueryWrapper<>();
-            equipmentCategoryQueryWrapper.eq("code", equipTypeAmountPage.getEquipmentClassificationCode());
+            if(equipmentCategory!=null)
+            {
+                equipmentCategoryQueryWrapper.eq("code", equipmentCategory.getCode());
+            }else
+            {
+                equipmentCategoryQueryWrapper.eq("code", equipTypeAmountPage.getEquipmentClassificationCode());
+            }
             equipmentCategoryQueryWrapper.eq("industry_code", equipTypeAmountPage.getIndustryCode());
             List<EquipmentCategory> equipmentCategoryList = equipmentCategoryService.list(equipmentCategoryQueryWrapper);
             if (CollectionUtils.isEmpty(equipmentCategoryList)) {