报警列表 解除人 判空

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

@@ -166,9 +166,11 @@ public class MsgAlarmController extends BaseController {
                 if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
                     o.setRailwayName(baseRailwayManagement.getRailwayName());
                 }
-                if (StringUtils.isNotEmpty(o.getReleasedBy())) {
+                if (!StringUtils.isEmptySunhh(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);