解除人 不匹配 项目内部 用户表

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

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

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

@@ -167,10 +167,11 @@ public class MsgAlarmController extends BaseController {
                     o.setRailwayName(baseRailwayManagement.getRailwayName());
                 }
                 if (!StringUtils.isEmptySunhh(o.getReleasedBy())) {
-                    BaseUser user = baseUserService.getUser(o.getReleasedBy());
-                    if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
-                        o.setReleasedByName(user.getNickName());
-                    }
+//                    BaseUser user = baseUserService.getUser(o.getReleasedBy());
+//                    if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
+//                        o.setReleasedByName(user.getNickName());
+//                    }
+                    o.setReleasedByName(o.getReleasedBy());
                 }
                 String mils = AppendUtils.stringAppend(o.getAlarmMile());
                 o.setAlarmMiles(mils);
@@ -223,10 +224,11 @@ public class MsgAlarmController extends BaseController {
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
             }
             if (StringUtils.isNotEmpty(o.getReleasedBy())) {
-                BaseUser user = baseUserService.getUser(o.getReleasedBy());
-                if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
-                    o.setReleasedByName(user.getNickName());
-                }
+//                BaseUser user = baseUserService.getUser(o.getReleasedBy());
+//                if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
+//                    o.setReleasedByName(user.getNickName());
+//                }
+                o.setReleasedByName(o.getReleasedBy());
             }
             String mils = AppendUtils.stringAppend(o.getAlarmMile());
             o.setAlarmMiles(mils);
@@ -258,10 +260,11 @@ public class MsgAlarmController extends BaseController {
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             if (!StringUtils.isEmptySunhh(msgAlarm.getReleasedBy())) {
-                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
-                    msgAlarmResp.setReleasedByName(user.getNickName());
-                }
+//                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
+//                if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
+//                    msgAlarmResp.setReleasedByName(user.getNickName());
+//                }
+                msgAlarmResp.setReleasedByName(msgAlarm.getReleasedBy());
             }
             if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
                 msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());