解除人判空

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

@@ -837,7 +837,9 @@ public class BaseCameraManagementController extends BaseController {
                 MsgAlarm msgAlarm = list.get(0);
                 if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
                     BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                    msgAlarm.setReleasedByName(user.getNickName());
+                    if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
+                        msgAlarm.setReleasedByName(user.getNickName());
+                    }
                 }
                 msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
                 msgAlarmResp.setIsRelease(msgAlarm.getIsRelease());

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

@@ -224,7 +224,9 @@ public class MsgAlarmController extends BaseController {
             }
             if (StringUtils.isNotEmpty(o.getReleasedBy())) {
                 BaseUser user = baseUserService.getUser(o.getReleasedBy());
-                o.setReleasedByName(user.getNickName());
+                if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
+                    o.setReleasedByName(user.getNickName());
+                }
             }
             String mils = AppendUtils.stringAppend(o.getAlarmMile());
             o.setAlarmMiles(mils);
@@ -257,7 +259,9 @@ public class MsgAlarmController extends BaseController {
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             if (!StringUtils.isEmptySunhh(msgAlarm.getReleasedBy())) {
                 BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                msgAlarmResp.setReleasedByName(user.getNickName());
+                if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
+                    msgAlarmResp.setReleasedByName(user.getNickName());
+                }
             }
             if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
                 msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());