From 38013213cd98d7407ace93fa8bb3cf70a31be344 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 11 Sep 2024 15:55:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=80=9A=E8=BF=87=E8=B5=B7=E8=8D=89?=
 =?UTF-8?q?=E7=BB=84id=E5=92=8C=E4=BC=81=E4=B8=9Aid=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E5=92=8C=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF=20=E8=A7=A3?=
 =?UTF-8?q?=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayDraftingGroupSubItemServiceImpl.java    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
index d3e1fb22..ec2f9063 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
@@ -11,6 +11,7 @@ import com.jero.common.dto.PaySendContactsMessageDTO;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ContractCreateProjectSendMessageService;
 import com.jero.common.service.RolePermissionService;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ImportExcelUtil;
 import com.jero.common.util.PasswordUtil;
@@ -92,6 +93,8 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
     private PayDraftingGroupSubItemContactsMapper payDraftingGroupSubItemContactsMapper;
     @Resource
     private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
+    @Resource
+    private ISysBaseAPI sysBaseAPI;
 
     /**
      * 分页查询
@@ -236,10 +239,21 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
         List<String> contactIdList = subItemContactsList.stream().map(PayDraftingGroupSubItemContacts::getContactsId).collect(Collectors.toList());
         List<PayContactsManagement> contactsManagementList = payContactsManagementService.listByIds(contactIdList);
         for (PayContactsManagement contactsManagement : contactsManagementList) {
-                contactsManagement.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
-                contactsManagement.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
+            String phone = contactsManagement.getPhone();
+            if (StringUtils.isNotBlank(phone)){
+                contactsManagement.setPhone(PasswordUtil.decrypt(phone));
+            }
+            String email = contactsManagement.getEmail();
+            if (StringUtils.isNotBlank(email)){
+                contactsManagement.setEmail(PasswordUtil.decrypt(email));
+            }
+            String gender = contactsManagement.getGender();
+            if (StringUtils.isNotBlank(gender)){
+                contactsManagement.setGender(sysBaseAPI.translateDict("sex", gender));
+            }
         }
         companyInfoVO.setContactsManagementList(contactsManagementList);
+
         return companyInfoVO;
     }
     /**