diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java index c6ce111f..586add01 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java @@ -26,7 +26,7 @@ public enum MessageUrlEnums { M_OPEN_TYPE12("M_OPEN_TYPE12","component","@comp/ProjectDetailModal"), M_OPEN_TYPE13("M_OPEN_TYPE13","component","@comp/ProjectDetailModal"), M_OPEN_TYPE14("M_OPEN_TYPE14","url","/contractManagement/RevenueContractDetail"), - M_OPEN_TYPE15("M_OPEN_TYPE15","component",""), + M_OPEN_TYPE15("M_OPEN_TYPE15","component","@views/financialManagement/arriveAndInvoicing/modules/AuditProofModule"), M_OPEN_TYPE16("M_OPEN_TYPE16","url","/contractManagement/RevenueContractDetail"), // todo 待定企业端 C_OPEN_TYPE1("C_OPEN_TYPE1","href",""), diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index ac75f7e3..6b217b7f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -253,20 +253,7 @@ public class PayContactsManagementController extends JeroController list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); - if(!CollectionUtils.isEmpty(list)){ + SysUser sysUser = sysUserService.getById(principalId); + if(!CollectionUtils.isEmpty(list) && !Objects.isNull(sysUser)){ list.forEach(item->{ // 发送消息 SendMessageDTO sendMessageDTO = new SendMessageDTO(); @@ -348,9 +349,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl