From 8dc8985eb32198788bef7ad21cf3f1726d840b6f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 19:33:23 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
index 7c6e23d..011621d 100644
--- a/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
@@ -469,6 +469,7 @@
throw new BusinessException(ResponseStatus.OBJECT_EMP.getCode(), "鏈煡璇㈠埌杞簱鍗曠被鍨嬩俊鎭��"+wTransfer.getType()+"銆�");
}
+
sendOutNotice(companyUser.getId(),wTransfer.getId(),wTransfer.getCode(),notices_type_transfer,Constants.getNoticeUrl(loginUserInfo.getCompany(),Constants.DINGDING_NOTICE_URL.out));
//璁板綍鎿嶄綔璁板綍
@@ -480,6 +481,7 @@
public void sendOutNotice(Integer userId ,Integer billId , String billCode ,Constants.Notices_Type_Transfer notices_type_transfer,String url){
+
//鍙戦�侀�氱煡
Notices notices = new Notices();
notices.setCompanyUserId(userId);
@@ -487,10 +489,13 @@
notices.setContent("銆�"+billCode+"銆�"+ notices_type_transfer.getContent().replace("{optType}","鍑哄簱"));
notices.setTitle(notices_type_transfer.getTitle());
notices.setObjId(billId);
- notices.setUrl(url.replace("{id}",billId.toString()));
+ if(!Objects.isNull(url)){
+ notices.setUrl(url.replace("{id}",billId.toString()));
+ }
noticesExtService.sendNotice(notices);
}
public void sendOutNotice(LoginUserInfo user,Integer userId ,Integer billId , String billCode ,Constants.Notices_Type_Transfer notices_type_transfer,String url){
+
//鍙戦�侀�氱煡
Notices notices = new Notices();
notices.setCompanyUserId(userId);
@@ -498,11 +503,14 @@
notices.setContent("銆�"+billCode+"銆�"+ notices_type_transfer.getContent().replace("{optType}","鍑哄簱"));
notices.setTitle(notices_type_transfer.getTitle());
notices.setObjId(billId);
- notices.setUrl(url.replace("{id}",billId.toString()));
+ if(!Objects.isNull(url)){
+ notices.setUrl(url.replace("{id}",billId.toString()));
+ }
noticesExtService.sendNoticeNologin(notices,user);
}
public void sendInNotice(Integer userId ,Integer billId , String billCode ,Constants.Notices_Type_Transfer notices_type_transfer,String url){
+
//鍙戦�侀�氱煡
Notices notices = new Notices();
notices.setCompanyUserId(userId);
@@ -510,7 +518,9 @@
notices.setContent("銆�"+billCode+"銆�"+ notices_type_transfer.getContent().replace("{optType}","鍏ュ簱"));
notices.setTitle(notices_type_transfer.getTitle());
notices.setObjId(billId);
- notices.setUrl(url.replace("{id}",billId.toString()));
+ if(!Objects.isNull(url)){
+ notices.setUrl(url.replace("{id}",billId.toString()));
+ }
noticesExtService.sendNotice(notices);
}
--
Gitblit v1.9.3