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 @@