|
@@ -177,7 +177,9 @@ public class MsgAlarmController extends BaseController {
|
|
|
}
|
|
|
if(!ObjectUtils.isEmpty(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());
|
|
|
o.setAlarmMiles(mils);
|