From 5bed75960b895ad2e0f0ec4becdd8f7641ceae9d Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Fri, 29 Aug 2025 14:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81,=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/weaver/seconddev/entry/action/SendMessageAction.java | 5 +++--
 .../com/weaver/seconddev/entry/mapper/SendMessageMapper.java | 2 +-
 src/main/resources/mapper/entry/action/SendMessageMapper.xml | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/entry/action/SendMessageAction.java b/src/main/java/com/weaver/seconddev/entry/action/SendMessageAction.java
index aea3db7..f22196e 100644
--- a/src/main/java/com/weaver/seconddev/entry/action/SendMessageAction.java
+++ b/src/main/java/com/weaver/seconddev/entry/action/SendMessageAction.java
@@ -54,11 +54,12 @@ public class SendMessageAction implements EsbServerlessRpcRemoteInterface {
         String templateId = (String) params.get("templateId");
         String templateVersionName = (String) params.get("templateVersionName");
         String content = (String) params.get("content");
+        String type = (String) params.get("type");
 
         log.error("params===" + JSON.toJSONString(params));
 
         BaseParam baseParam = new BaseParam();
-        MessageSendConfig messageSendConfig = sendMessageMapper.getMessageSendConfig(baseParam, departmentId);
+        MessageSendConfig messageSendConfig = sendMessageMapper.getMessageSendConfig(baseParam, departmentId,type);
 
         while (messageSendConfig == null && StringUtils.isNotBlank(departmentId)) {
             String parentDepartmentId = sendMessageMapper.getParentDepartmentId(baseParam, departmentId);
@@ -68,7 +69,7 @@ public class SendMessageAction implements EsbServerlessRpcRemoteInterface {
                 break;
             }
             departmentId = parentDepartmentId;
-            messageSendConfig = sendMessageMapper.getMessageSendConfig(baseParam, departmentId);
+            messageSendConfig = sendMessageMapper.getMessageSendConfig(baseParam, departmentId,type);
         }
 
         if (null == messageSendConfig) {
diff --git a/src/main/java/com/weaver/seconddev/entry/mapper/SendMessageMapper.java b/src/main/java/com/weaver/seconddev/entry/mapper/SendMessageMapper.java
index d03e1ce..f0c8348 100644
--- a/src/main/java/com/weaver/seconddev/entry/mapper/SendMessageMapper.java
+++ b/src/main/java/com/weaver/seconddev/entry/mapper/SendMessageMapper.java
@@ -18,7 +18,7 @@ public interface SendMessageMapper {
 
     String getParentDepartmentId(@Param("param") BaseParam param, @Param("departmentId") String departmentId);
 
-    MessageSendConfig getMessageSendConfig(@Param("param") BaseParam param, @Param("departmentId") String departmentId);
+    MessageSendConfig getMessageSendConfig(@Param("param") BaseParam param, @Param("departmentId") String departmentId,@Param("type") String type);
 
     String getSuperior(@Param("param") BaseParam param, @Param("employeeId") String employeeId);
 
diff --git a/src/main/resources/mapper/entry/action/SendMessageMapper.xml b/src/main/resources/mapper/entry/action/SendMessageMapper.xml
index 12b0b0e..4fefe81 100644
--- a/src/main/resources/mapper/entry/action/SendMessageMapper.xml
+++ b/src/main/resources/mapper/entry/action/SendMessageMapper.xml
@@ -14,6 +14,7 @@
     <select id="getMessageSendConfig" resultType="com.weaver.seconddev.entry.entity.MessageSendConfig">
         select bm,ry,xxlx,ms,zjsj,jgsjzjssj,xxsj,bmfzr,tbmyg,hrbp,fgld
         from ${param.eteams}.uf_xxgzb t1 where t1.tenant_key = #{param.tenantKey} and t1.delete_type = 0
+        and xxlx = #{type}
         and FIND_IN_SET(#{departmentId}, bm) > 0
     </select>