Bläddra i källkod

检验意见通知书接收人显示调整

xy 1 vecka sedan
förälder
incheckning
e0ad450cff

+ 5 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -6190,7 +6190,11 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 max.ifPresent(businessMemberRelationDO -> {
                     MemberUserRespDTO memberUserRespDTO = finalUserMap.get(businessMemberRelationDO.getMemberId());
                     if (ObjectUtil.isNotEmpty(memberUserRespDTO)) {
-                        item.setRecipient(memberUserRespDTO.getName());
+                        if (memberUserRespDTO.getName() != null && !memberUserRespDTO.getName().isEmpty()){
+                            item.setRecipient(memberUserRespDTO.getName());
+                        }else{
+                            item.setRecipient(memberUserRespDTO.getNickname());
+                        }
                         item.setRecipientPhone(memberUserRespDTO.getMobile());
                     }
                 });

+ 6 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -5390,7 +5390,12 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 max.ifPresent(businessMemberRelationDO -> {
                     MemberUserRespDTO memberUserRespDTO = finalUserMap.get(businessMemberRelationDO.getMemberId());
                     if (ObjectUtil.isNotEmpty(memberUserRespDTO)) {
-                        item.setRecipient(memberUserRespDTO.getName());
+                        if (memberUserRespDTO.getName() != null && !memberUserRespDTO.getName().isEmpty()){
+                            item.setRecipient(memberUserRespDTO.getName());
+                        }else{
+                            item.setRecipient(memberUserRespDTO.getNickname());
+                        }
+
                         item.setRecipientPhone(memberUserRespDTO.getMobile());
                     }
                 });