报警详情

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

@@ -316,7 +316,9 @@ public class MsgAlarmController extends BaseController {
                 BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
                 msgAlarmResp.setReleasedByName(user.getNickName());
             }
-            msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
+            if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
+                msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
+            }
 //            msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
 //            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
 //            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());