Browse Source

监测系统修改去掉校验

wyyay 1 year ago
parent
commit
56f3931b32

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

@@ -177,7 +177,9 @@ public class MsgAlarmController extends BaseController {
                 }
                 }
                 if(!ObjectUtils.isEmpty(o.getSource())){
                 if(!ObjectUtils.isEmpty(o.getSource())){
                     MonitorSystem monitorSystem = monitorSystemService.selectByClientId(o.getSource());
                     MonitorSystem monitorSystem = monitorSystemService.selectByClientId(o.getSource());
-                    o.setSourceName(monitorSystem.getMonitorSystemName());
+                    if(!ObjectUtils.isEmpty(monitorSystem)){
+                        o.setSourceName(monitorSystem.getMonitorSystemName());
+                    }
                 }
                 }
                 String mils = AppendUtils.stringAppend(o.getAlarmMile());
                 String mils = AppendUtils.stringAppend(o.getAlarmMile());
                 o.setAlarmMiles(mils);
                 o.setAlarmMiles(mils);