gao.qiang 2 éve
szülő
commit
35990df037

+ 3 - 1
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -226,7 +226,9 @@ public class MsgAlarmController extends BaseController {
                     wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
                 }
                 o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
-                o.setReleasedTypeName(o.getReleasedType() == 1 ? "真实报警" : "误报警");
+                if (!ObjectUtils.isEmpty(o.getReleasedType())) {
+                    o.setReleasedTypeName(o.getReleasedType() == 1 ? "真实报警" : "误报警");
+                }
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);