修改bug

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

@@ -174,21 +174,24 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                     list = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0");
                 }
             }
-            switch ( ent.getConfirmType()){
-                case "火警":
-                    ent.setType("FIREALARM");
-                    break;
-                case "故障":
-                    ent.setType("BREAKDOWN");
-                    break;
-                case "屏蔽":
-                    ent.setType("SHIELD");
-                    break;
-                case "预警":
-                    ent.setType("NOTICE");
-                    break;
-                default:
-                    ent.setType("");
+
+            if (ent.getType() != null){
+                switch ( ent.getType()){
+                    case "火警":
+                        ent.setType("FIREALARM");
+                        break;
+                    case "故障":
+                        ent.setType("BREAKDOWN");
+                        break;
+                    case "屏蔽":
+                        ent.setType("SHIELD");
+                        break;
+                    case "预警":
+                        ent.setType("NOTICE");
+                        break;
+                    default:
+                        ent.setType("");
+                }
             }
 
             ent.setUpdateDate(new Date());