修改bug

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

@@ -145,6 +145,12 @@ public class EquipmentSpecificAlarmController extends AbstractBaseController {
     @ApiOperation(httpMethod = "GET", value = "装备分页查询", notes = "装备分页查询")
     public ResponseModel getEqPage(int pageNum, int pageSize, AlarmDTO dto) {
         Page page = new Page<>(pageNum, pageSize);
+        if ("全部".equals(dto.getWarehouseStructureName())){
+        dto.setWarehouseStructureName(null);
+        }
+        if ("all".equals(dto.getStatus())){
+            dto.setStatus(null);
+        }
         Page<EquipSpecificAlarmDTO> pageBean = iEquipmentSpecificAlarmService.getEqPage(page, dto);
         return CommonResponseUtil.success(pageBean);
     }

amos-boot-system-equip/src/main/resources/mapper/EquipmentMapper.xml

@@ -224,7 +224,7 @@ FROM
             WI.id,
             WI.unit as unitName,
             WI.name as perfQuotaName,
-            si.`value`,
+            (case when si.value_label is null then si.value else si.value_label end) as value,
             WI.group_name
         FROM
             wl_equipment_specific_index  si,