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 personNames = persons.stream().filter(o-> !charge.equals(o.getPersonId())).map(o-> UserCache.getUser(o.getPersonId()).getName()).collect(Collectors.toList()); + List 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 { R user = userClient.userInfoById(sig.getRegistrant()); if (user.isSuccess()&&ObjectUtils.isNotEmpty(user.getData())){ - sig.setRegistrantName(user.getData().getName()); + sig.setRegistrantName(user.getData().getRealName()); } R 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 imsDutyGroupPVOS = imsDutyGroupPService.listByGroupId(entity.getId()); if (CollectionUtil.isNotEmpty(imsDutyGroupPVOS)){ @@ -176,7 +176,7 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl 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() {{ @@ -1629,7 +1629,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl