查询bug修改

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

@@ -99,10 +99,10 @@ public class FireFightingSystemController extends AbstractBaseController {
 
     @Autowired
     EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
-    
+
     @Autowired
     ICarService carService;
-    
+
     @RequestMapping(value = "/getEquiplistBySystemId", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("根据系统id查询设备列表")
@@ -533,7 +533,7 @@ public class FireFightingSystemController extends AbstractBaseController {
                     equipmentCategory = equipmentCategoryService.getById(equipmentCategory.getParentId());
                 }
             }
-            return fireFightingSystemService.getColaCategoryAmountEquList(inhierarchy, equipTypeAmountPage.getEquipmentClassificationCode().replaceAll("0+$", ""), equipTypeAmountPage);
+            return fireFightingSystemService.getColaCategoryAmountEquList(inhierarchy, equipTypeAmountPage.getEquipmentClassificationCode(), equipTypeAmountPage);
 
             //String classificationCode = equipTypeAmountPage.getEquipmentClassificationCode().replaceAll("0+$", "");
             //return fireFightingSystemService.getColaCategoryAmountEquList(inhierarchy, classificationCode.length() % 2 == 0 ? classificationCode : classificationCode + "0", equipTypeAmountPage);
@@ -877,7 +877,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     }
 
     /**
-     * 获取人员部门树7		
+     * 获取人员部门树7
      *
      * @return list
      */
@@ -948,7 +948,7 @@ public class FireFightingSystemController extends AbstractBaseController {
 
     /**
      * 获取装备类型和统计值
-     * @throws Exception 
+     * @throws Exception
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取装备类型和统计值", notes = "获取装备类型和统计值")
@@ -956,10 +956,10 @@ public class FireFightingSystemController extends AbstractBaseController {
     public Object getEquipmentTypeAndCount( @RequestParam(required = false) String bizOrgCode) throws Exception {
         return fireFightingSystemService.getEquipmentTypeAndCount(bizOrgCode);
     }
- 
+
     /**
      * 获取车辆类型和统计值
-     * @throws Exception 
+     * @throws Exception
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取车辆类型和统计值", notes = "获取车辆类型和统计值")
@@ -1018,7 +1018,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     public Object getSystemAlarmInfoList(@RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate) throws Exception {
         return fireFightingSystemService.getSystemAlarmInfoList(startDate, endDate);
     }
-    
+
     /**
      * 重置画布数据
      *