From 1c4de3dad5e7c505f08cd6020d29b84a60668b02 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 23 四月 2025 09:43:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java index 911fd4f..c24a0b8 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java @@ -699,9 +699,8 @@ ); if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(systemUserList)) { WxPlatNotice wxPlatNotice = new WxPlatNotice(); - wxPlatNotice.sendPlatformJobSignNotice(wxNoticeConfigMapper, platformJob, + wxPlatNotice.sendPlatformJobSignNotice(systemDictDataBiz,wxNoticeConfigMapper, platformJob, WxPlatConstants.platformJobContent.platformGroupSignIn, - systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(), systemUserList.stream().map(i->i.getOpenid()).collect(Collectors.toList()) ); } @@ -743,11 +742,10 @@ ); if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(systemUserList)) { WxPlatNotice wxPlatNotice = new WxPlatNotice(); - wxPlatNotice.sendUnFinishNotice( + wxPlatNotice.sendUnFinishNotice(systemDictDataBiz, wxNoticeConfigMapper, platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformGroupId(),groupId)).collect(Collectors.toList()).size(), WxPlatConstants.platformJobContent.unFinishNotice, - systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(), systemUserList.stream().map(i->i.getOpenid()).collect(Collectors.toList()) ); } @@ -1026,7 +1024,6 @@ wxPlatNotice.sendPlatformJobTemplateNotice(systemDictDataBiz, wxNoticeConfigMapper, p, objCode, - systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(), Arrays.asList(driver.getOpenid().split(",")) ); } -- Gitblit v1.9.3