任务 8322

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

@@ -172,11 +172,13 @@ public class EquipmentIndexController {
                     queryWrapper.inSql(SignalClassify::getTypeCode,
                             "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + equipmentIndex.getTypeCode().toUpperCase() +"'");
                     signalClassify = signalClassifyMapper.selectOne(queryWrapper);
+                    if(!ObjectUtils.isEmpty(signalClassify)){
                         equipmentIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
                         equipmentIndex.setIsAlarm(signalClassify.getIsAlarm());
                         equipmentIndex.setEmergencyLevel(signalClassify.getEmergencyLevel());
                         equipmentIndex.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
                     }
+                }
                 QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();
                 equipmentDetailQueryWrapper.eq("equipment_id", equipmentIndex.getEquipmentId());
                 List<EquipmentDetail> equipDetailList = iEquipmentDetailService.list(equipmentDetailQueryWrapper);
@@ -205,7 +207,7 @@ public class EquipmentIndexController {
                         for (EquipmentSpecificIndex y : indexList) {
                             y.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
                             y.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
-                            if (bool.get()) {
+                            if (bool.get() && !ObjectUtils.isEmpty(signalClassify)) {
                                 y.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
                                 y.setIsAlarm(signalClassify.getIsAlarm());
                                 y.setEmergencyLevel(signalClassify.getEmergencyLevel());