From 6f1680fd720c468a438563ba047860611e4201e5 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Tue, 28 May 2024 10:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=86=E9=85=8D=20?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8F=90=E9=86=92=E5=8F=82=E6=95=B0=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/bpm/convert/message/BpmMessageConvert.java     | 5 +++--
 .../module/bpm/service/message/BpmMessageServiceImpl.java | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
index 3c25aa9f..f03929a9 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
@@ -135,7 +135,8 @@ public interface BpmMessageConvert {
      * @return
      */
     default SubscribeMessageReqDTO convertWorkTask(String openId, String processInstanceName, BpmOAWorkTaskDO workTaskDO,
-                                                   String nickname, String time, String miniProgramState, Boolean isFlag) {
+                                                   String nickname, String time, String miniProgramState, Boolean isFlag,
+                                                   Long deptId) {
 
         SubscribeMessageReqDTO message = new SubscribeMessageReqDTO();
         message.setToUser(openId);
@@ -171,7 +172,7 @@ public interface BpmMessageConvert {
 
         message.setMiniprogramState(miniProgramState);
         if (isFlag) {
-            message.setPage("subPages/task/taskAssignment?userId=" + workTaskDO.getReceiverUserId());
+            message.setPage("subPages/task/taskAssignment?userId=" + workTaskDO.getReceiverUserId() + "&deptId=" + deptId);
         }else {
             message.setPage("subPages/task/taskDispose?id=" + workTaskDO.getId());
         }
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java
index 060a4da8..b2cee188 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java
@@ -11,6 +11,8 @@ import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcess
 import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
 import cn.iocoder.yudao.module.bpm.service.oa.BpmOAWorkTaskService;
 import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
 import cn.iocoder.yudao.module.system.api.subscribe.SubscribeMessageSendApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -91,9 +93,11 @@ public class BpmMessageServiceImpl implements BpmMessageService {
 
             if (workTaskDO != null) {
 
+                AdminUserRespDTO userRespDTO = userApi.getUser(workTaskDO.getReceiverUserId()).getCheckedData();
+
                 subscribeMessageSendApi.sendWorkLogComment(BpmMessageConvert.INSTANCE.convertWorkTask(
                         openId, reqDTO.getProcessInstanceName(), workTaskDO, nickName, reqDTO.getCreateTime(),
-                        "formal", true));
+                        "formal", true, userRespDTO.getDeptId()));
             }else {
 
                 subscribeMessageSendApi.sendApprovalResultNotification(
@@ -211,7 +215,7 @@ public class BpmMessageServiceImpl implements BpmMessageService {
 
                     subscribeMessageSendApi.sendWorkLogComment(BpmMessageConvert.INSTANCE.convertWorkTask(
                             openId, reqDTO.getProcessInstanceName(), workTaskDO, reqDTO.getStartUserNickname(), reqDTO.getCreateTime(),
-                            "formal", false));
+                            "formal", false, null));
                 }else {
 
                     subscribeMessageSendApi.sendProcessToDoReminder(BpmMessageConvert.INSTANCE.convertProcessToDoReminder(