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 contactIdList = subItemContactsList.stream().map(PayDraftingGroupSubItemContacts::getContactsId).collect(Collectors.toList()); List 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; } /**