From 73bbd2eb855b9ebd71077798701bb1b71d895c60 Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 28 Mar 2024 14:50:49 +0800
Subject: [PATCH] =?UTF-8?q?#=E7=94=A8=E6=88=B7=E5=B1=95=E7=A4=BA=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/business/impl/DutyServiceImpl.java   |  8 ++++----
 .../operational/duty/feign/DutyGroupClient.java    |  2 +-
 .../service/impl/ImsDutyChangeServiceImpl.java     |  8 ++++----
 .../service/impl/ImsDutyEmergencyServiceImpl.java  |  4 ++--
 .../duty/service/impl/ImsDutyGroupServiceImpl.java | 10 +++++-----
 .../duty/service/impl/ImsDutyMainServiceImpl.java  | 12 ++++++------
 .../duty/service/impl/ImsDutyRecServiceImpl.java   | 22 +++++++++++-----------
 .../scheduled/SafeToolTypePushUserTask.java        |  2 +-
 .../wrapper/ImsMonAlarmInfoWrapper.java            |  2 +-
 .../service/impl/OperationTicketServiceImpl.java   | 10 +++++-----
 10 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java
index 5566c77..f1ce357 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java
@@ -63,7 +63,7 @@ public class DutyServiceImpl extends BaseServiceImpl<DutyMapper, ImsDutyMainEnti
             // 负责人
             User user = UserCache.getUser(Long.valueOf(item.getManagerId()));
             if (ObjectUtil.isNotEmpty(user)) {
-                item.setManagerName(user.getName());
+                item.setManagerName(user.getRealName());
                 item.setManagerPhone(user.getPhone());
             }
             // FIXME 上网
@@ -117,7 +117,7 @@ public class DutyServiceImpl extends BaseServiceImpl<DutyMapper, ImsDutyMainEnti
         // 负责人
         User user = UserCache.getUser(Long.valueOf(dutyMainInfoVo.getManagerId()));
         if (ObjectUtil.isNotEmpty(user)) {
-            dutyInfoVo.setManagerName(user.getName());
+            dutyInfoVo.setManagerName(user.getRealName());
             dutyInfoVo.setManagerPhone(user.getPhone());
         }
         // 发电量
@@ -143,7 +143,7 @@ public class DutyServiceImpl extends BaseServiceImpl<DutyMapper, ImsDutyMainEnti
         // 负责人
         User user = UserCache.getUser(Long.valueOf(dutyMainInfoVo.getManagerId()));
         if (ObjectUtil.isNotEmpty(user)) {
-            dutyInfoVo.setManagerName(user.getName());
+            dutyInfoVo.setManagerName(user.getRealName());
             dutyInfoVo.setManagerPhone(user.getPhone());
         }
         dutyInfoVo.setGeneratingCapacity(0);
@@ -183,7 +183,7 @@ public class DutyServiceImpl extends BaseServiceImpl<DutyMapper, ImsDutyMainEnti
         // 负责人
         User user = UserCache.getUser(Long.valueOf(dutyMainInfoVo.getManagerId()));
         if (ObjectUtil.isNotEmpty(user)) {
-            dutyMainInfoVo.setManagerName(user.getName());
+            dutyMainInfoVo.setManagerName(user.getRealName());
             dutyMainInfoVo.setManagerPhone(user.getPhone());
         }
         return dutyMainInfoVo;
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyGroupClient.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyGroupClient.java
index aef332c..4effdf0 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyGroupClient.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyGroupClient.java
@@ -47,7 +47,7 @@ public class DutyGroupClient implements IDutyGroupClient {
 		if(CollectionUtil.isEmpty(persons)){
 			return group;
 		}
-		List<String> personNames = persons.stream().filter(o-> !charge.equals(o.getPersonId())).map(o-> UserCache.getUser(o.getPersonId()).getName()).collect(Collectors.toList());
+		List<String> personNames = persons.stream().filter(o-> !charge.equals(o.getPersonId())).map(o-> UserCache.getUser(o.getPersonId()).getRealName()).collect(Collectors.toList());
 		if(CollectionUtil.isEmpty(personNames)){
 			group.setRepairPersonnelSum(0);
 			return group;
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java
index 307f891..dd17e98 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyChangeServiceImpl.java
@@ -120,10 +120,10 @@ public class ImsDutyChangeServiceImpl extends BaseServiceImpl<ImsDutyChangeMappe
 		ImsDutyChangeVO vo = ImsDutyChangeWrapper.build().entityVO(detail);
 		try {
 			log.info(detail.getCreateUser() + "..............");
-			vo.setCreateUserName(UserCache.getUser(detail.getCreateUser()).getName());
-			vo.setUpdateUserName(UserCache.getUser(detail.getUpdateUser()).getName());
-			vo.setAcceptPersonName(UserCache.getUser(detail.getAcceptPersonId()).getName());
-			vo.setApplyPersonName(UserCache.getUser(detail.getApplyPersonId()).getName());
+			vo.setCreateUserName(UserCache.getUser(detail.getCreateUser()).getRealName());
+			vo.setUpdateUserName(UserCache.getUser(detail.getUpdateUser()).getRealName());
+			vo.setAcceptPersonName(UserCache.getUser(detail.getAcceptPersonId()).getRealName());
+			vo.setApplyPersonName(UserCache.getUser(detail.getApplyPersonId()).getRealName());
 			ImsSchedulingVo imsSchedulingVo1 = dutyMainService.getByIdOneV2(detail.getAcceptDutyId());
 			vo.setAcceptDutyMainVo(imsSchedulingVo1);
 			ImsSchedulingVo imsSchedulingVo = dutyMainService.getByIdOneV2(detail.getApplyDutyId());
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
index 7e836e0..250304b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
@@ -81,11 +81,11 @@ public class ImsDutyEmergencyServiceImpl extends BaseServiceImpl<ImsDutyEmergenc
 			collect= records.stream().map(sig -> {
 				R<User> user = userClient.userInfoById(sig.getRegistrant());
 				if (user.isSuccess()&&ObjectUtils.isNotEmpty(user.getData())){
-					sig.setRegistrantName(user.getData().getName());
+					sig.setRegistrantName(user.getData().getRealName());
 				}
 				R<User> userR = userClient.userInfoById(sig.getChargePerson());
 				if (userR.isSuccess()&&ObjectUtils.isNotEmpty(userR.getData())){
-					sig.setChargePersonName(userR.getData().getName());
+					sig.setChargePersonName(userR.getData().getRealName());
 				}
 				ImsDutyClassEntity classEntity = imsDutyClassService.getById(sig.getDutyClass());
 				sig.setDutyClassName(classEntity.getClassName());
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
index 12efa2e..ae6f915 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java
@@ -166,8 +166,8 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
 			imsDutyGroupVO.setId(entity.getId());
 			imsDutyGroupVO.setManagerId(entity.getManagerId());
 			User user = UserCache.getUser(entity.getManagerId());
-			if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getName())){
-				imsDutyGroupVO.setManagerName(user.getName());
+			if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getRealName())){
+				imsDutyGroupVO.setManagerName(user.getRealName());
 			}
 			List<ImsDutyGroupPVO> imsDutyGroupPVOS = imsDutyGroupPService.listByGroupId(entity.getId());
 			if (CollectionUtil.isNotEmpty(imsDutyGroupPVOS)){
@@ -176,7 +176,7 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
 				String name="";
 				for (int i1 = 0; i1 < userIds.size(); i1++) {
 					if(ObjectUtil.isNotEmpty(entity.getManagerId())&&!entity.getManagerId().equals(userIds.get(i1))){
-						name = name + UserCache.getUser(userIds.get(i1)).getName();
+						name = name + UserCache.getUser(userIds.get(i1)).getRealName();
 						if (i1 != userIds.size() - 1) {
 							name = name + ",";
 						}
@@ -244,8 +244,8 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
 		for (ImsDutyGroupPVO imsDutyGroupPVo : imsDutyGroupPEntities) {
 			imsDutyGroupPVo.setSignage(false);
 			User user = UserCache.getUser(imsDutyGroupPVo.getPersonId());
-			if (ObjectUtil.isNotEmpty(user) && Func.isNotBlank(user.getName())) {
-				imsDutyGroupPVo.setGroupName(user.getName());
+			if (ObjectUtil.isNotEmpty(user) && Func.isNotBlank(user.getRealName())) {
+				imsDutyGroupPVo.setGroupName(user.getRealName());
 			} else {
 				groupIds.add(imsDutyGroupPVo.getId().toString());
 				this.baseMapper.updateManagerIdById(imsDutyGroupPVo.getGroupId());
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
index 2533308..cea4efa 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
@@ -809,9 +809,9 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
                                 User user = UserCache.getUser(Long.valueOf(split[j]));
                                 if (ObjectUtil.isNotEmpty(user)) {
                                     if (j == split.length - 1) {
-                                        s.setName(s.getName() + user.getName());
+                                        s.setName(s.getName() + user.getRealName());
                                     } else {
-                                        s.setName(s.getName() + user.getName() + "、");
+                                        s.setName(s.getName() + user.getRealName() + "、");
                                     }
                                 }
                             }
@@ -868,7 +868,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
                 if (ObjectUtil.isNotEmpty(user)) {
                     vo.setUserId(s);
                     if (ObjectUtil.isNotEmpty(user)) {
-                        vo.setUserName(user.getName());
+                        vo.setUserName(user.getRealName());
                     }
                     vo.setId(id);
                     list.add(vo);
@@ -894,8 +894,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
                 R<User> user = userClient.userInfoById(Long.valueOf(s));
                 if (user.isSuccess() && ObjectUtil.isNotEmpty(user.getData())) {
                     vo.setUserId(s);
-                    if (ObjectUtil.isNotEmpty(user.getData().getName())) {
-                        vo.setUserName(user.getData().getName());
+                    if (ObjectUtil.isNotEmpty(user.getData().getRealName())) {
+                        vo.setUserName(user.getData().getRealName());
                     }
                     vo.setId(id);
                     list.add(vo);
@@ -1083,7 +1083,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
                 dutyReportVO.setGroupName(imsDutyGroupEntity.getGroupName());
                 User user = UserCache.getUser(imsDutyGroupEntity.getManagerId());
                 if (ObjectUtil.isNotEmpty(user)){
-                    dutyReportVO.setManagerName(user.getName());
+                    dutyReportVO.setManagerName(user.getRealName());
                 }
                 dutyReportVO.setDutyNum(v.size());
                 //获取值班ID
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
index 6715144..26b4944 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java
@@ -342,8 +342,8 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             String userName = "";
             PushExtrasReq req = new PushExtrasReq();
             log.info("--------------------------req:" + req, groupEntityManagerId, userName, date);
-            if (ObjectUtil.isNotEmpty(userR.getData()) && StringUtil.isNotBlank(userR.getData().getName())) {
-                userName = userR.getData().getName();
+            if (ObjectUtil.isNotEmpty(userR.getData()) && StringUtil.isNotBlank(userR.getData().getRealName())) {
+                userName = userR.getData().getRealName();
                 log.info("--------------------------req2:" + req, groupEntityManagerId, userName, date);
             }
             String format = DateUtil.format(date, PATTERN_DATETIME);
@@ -552,11 +552,11 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         }
         ImsSchedulingVo imsSchedulingVo = imsDutyMainServiceImpl.getByIdOneV2(entity.getId(), null);//交班人
         if (ObjectUtil.isNotEmpty(imsSchedulingVo)&&null != imsSchedulingVo.getManagerId()) {
-            imsSchedulingVo.setUserName(userClient.userInfoById(imsSchedulingVo.getManagerId()).getData().getName());
+            imsSchedulingVo.setUserName(userClient.userInfoById(imsSchedulingVo.getManagerId()).getData().getRealName());
         }
         ImsSchedulingVo imsSchedulingVo1 = imsDutyMainServiceImpl.getByIdOneV2(null, entity.getId());
         if (ObjectUtil.isNotEmpty(imsSchedulingVo1)&&null != imsSchedulingVo1.getManagerId()) {
-            imsSchedulingVo1.setUserName(userClient.userInfoById(imsSchedulingVo1.getManagerId()).getData().getName());
+            imsSchedulingVo1.setUserName(userClient.userInfoById(imsSchedulingVo1.getManagerId()).getData().getRealName());
         }else {
             throw new ServiceException("没有找到接班对象值班信息，请联系管理人员，尽快进行排班！！！！");
         }
@@ -773,7 +773,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
                 if (ObjectUtil.isNotEmpty(groupEntityManagerId) && ObjectUtil.isNotEmpty(classEntity)) {
                     String userName = "";
                     if (null != groupEntityManagerId) {
-                        userName = userClient.userInfoById(groupEntityManagerId).getData().getName();
+                        userName = userClient.userInfoById(groupEntityManagerId).getData().getRealName();
                     }
                     PushExtrasReq req = new PushExtrasReq();
                     if (null != entity.getPreDutyId()) {
@@ -834,7 +834,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
                                         }
                                     }
                                 }
-                                remondingCarryV2(carryMainentity.getDutyDate(),2, carryManagerId, user.getData().getName(), classEntity, null, carryTenantId, carryCreateDept, carryMainentity.getId(), carryMainentity.getCreateUser());//提醒接班人
+                                remondingCarryV2(carryMainentity.getDutyDate(),2, carryManagerId, user.getData().getRealName(), classEntity, null, carryTenantId, carryCreateDept, carryMainentity.getId(), carryMainentity.getCreateUser());//提醒接班人
                             }
                         }
                     }
@@ -1157,7 +1157,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
         messagePushRecordDto.setTaskId(taskId);
         messagePushRecordDto.setTenantId(tenantId);
         messagePushRecordDto.setPusher(admin.getId().toString());
-        messagePushRecordDto.setPusherName(admin.getName());
+        messagePushRecordDto.setPusherName(admin.getRealName());
         messagePushRecordDto.setAccount(admin.getId().toString());
         messagePushRecordDto.setContent(" 负责人"+userName + datyTime+ "("+classEntity.getStartTime()
                 + "-" + classEntity.getEndTime()+")"+" 的值班,目前已交班延迟,请尽快联系该负责人进行交班工作!");
@@ -1620,7 +1620,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             ImsDutyGroupEntity groupEntity = imsDutyGroupService.getById(dutyGroupId);
             User manager = UserCache.getUser(groupEntity.getManagerId());
             if (cn.hutool.core.util.ObjectUtil.isNotEmpty(manager)){
-                managerName=manager.getName();
+                managerName=manager.getRealName();
             }
         }else {
             ImsDutyMainPersonEntity dutyMainPerson = imsDutyMainPersonService.getOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
@@ -1629,7 +1629,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             }});
             User manager = UserCache.getUser(dutyMainPerson.getDutyChargePerson());
             if (cn.hutool.core.util.ObjectUtil.isNotEmpty(manager)){
-                managerName=manager.getName();
+                managerName=manager.getRealName();
             }
         }
         return managerName;
@@ -1643,9 +1643,9 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
                 User user = UserCache.getUser(Long.valueOf(split[j]));
                 if (org.springblade.core.tool.utils.ObjectUtil.isNotEmpty(user)) {
                     if (j == split.length - 1) {
-                        handNumber= handNumber + user.getName();
+                        handNumber= handNumber + user.getRealName();
                     } else {
-                        handNumber= handNumber + user.getName()+ "、";
+                        handNumber= handNumber + user.getRealName()+ "、";
                     }
                 }
             }
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java
index 37f8adc..3ecf7ae 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafeToolTypePushUserTask.java
@@ -129,7 +129,7 @@ public class SafeToolTypePushUserTask {
 				else {
 					typeNames = typeEntityList.stream().map(SafetyToolTypeEntity::getTypeName).collect(Collectors.joining("、"));
 				}
-				XxlJobLogger.log("开始推送，推送人：{}",JSONObject.toJSONString(noticeUser.getName()));
+				XxlJobLogger.log("开始推送，推送人：{}",JSONObject.toJSONString(noticeUser.getRealName()));
 				if(sendType == APP_PUSH && Func.isNotEmpty(noticeUser.getPhone())){
 					//短信推送
 					String code = "safeTool";
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java
index 896aebf..084d6d5 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/ImsMonAlarmInfoWrapper.java
@@ -28,7 +28,7 @@ public class ImsMonAlarmInfoWrapper extends BaseEntityWrapper<ImsMonAlarmInfoEnt
 		if(entity != null){
 			ImsMonAlarmInfoVO vo = BeanUtil.copy(entity, ImsMonAlarmInfoVO.class);
 			vo.setCameraName(cameraInfoService.getById(vo.getCameraId()).getName());
-			vo.setAcceptUserName(UserCache.getUser(entity.getCreateUser()).getName());
+			vo.setAcceptUserName(UserCache.getUser(entity.getCreateUser()).getRealName());
 			return vo;
 		} else {
 			return null;
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
index 5736365..d0fbf33 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
@@ -201,8 +201,8 @@ public class OperationTicketServiceImpl implements OperationTicketService {
         //填充许可人
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getPrincipal())) {
             User principal = UserCache.getUser(standardTicketInfoVo.getPrincipal());
-            if (ObjectUtil.isNotEmpty(principal)&&StringUtils.isNotBlank(principal.getName())){
-                newStandardTicketInfoEntity.setIssueOrderPersonName(principal.getName());
+            if (ObjectUtil.isNotEmpty(principal)&&StringUtils.isNotBlank(principal.getRealName())){
+                newStandardTicketInfoEntity.setIssueOrderPersonName(principal.getRealName());
             }
         }
         standardTicketInfoService.updateById(newStandardTicketInfoEntity);
@@ -415,20 +415,20 @@ public class OperationTicketServiceImpl implements OperationTicketService {
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getIssueOrderPerson())) {
             User issueOrderPerson = UserCache.getUser(standardTicketInfoVo.getIssueOrderPerson());
             if (ObjectUtil.isNotEmpty(issueOrderPerson)){
-                standardTicketInfo.setIssueOrderPersonName(issueOrderPerson.getName());
+                standardTicketInfo.setIssueOrderPersonName(issueOrderPerson.getRealName());
             }
         }
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getAccessOrderPerson())) {
             User accessOrderPerson = UserCache.getUser(standardTicketInfoVo.getAccessOrderPerson());
             if (ObjectUtil.isNotEmpty(accessOrderPerson)){
-                standardTicketInfo.setAccessOrderPersonName(accessOrderPerson.getName());
+                standardTicketInfo.setAccessOrderPersonName(accessOrderPerson.getRealName());
             }
         }
 
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getGuardian())) {
             User guardian = UserCache.getUser(standardTicketInfoVo.getGuardian());
             if (ObjectUtil.isNotEmpty(guardian)){
-                standardTicketInfo.setGuardianName(guardian.getName());
+                standardTicketInfo.setGuardianName(guardian.getRealName());
             }
         }