|
|
@@ -298,6 +298,12 @@ public class TaskController extends BladeController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ for (int i = 0; i < userList.size(); i++) {
|
|
|
+ if (Objects.equals(userList.get(i).getId(), AuthUtil.getUserId())) {
|
|
|
+ userList.remove(i);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (data.size() > 0) {
|
|
|
// List<User> xcxUserList = userClient.getXcxUserListByWebUserId(ids);
|
|
|
String openidS = userList.stream().map(User::getOaOpenId).filter(Objects::nonNull).collect(Collectors.joining(","));
|
|
|
@@ -484,13 +490,19 @@ public class TaskController extends BladeController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ for (int i = 0; i < userList.size(); i++) {
|
|
|
+ if (Objects.equals(userList.get(i).getId(), AuthUtil.getUserId())) {
|
|
|
+ userList.remove(i);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (data.size() > 0) {
|
|
|
// List<User> xcxUserList = userClient.getXcxUserListByWebUserId(ids);
|
|
|
String openidS = userList.stream().map(User::getOaOpenId).filter(Objects::nonNull).collect(Collectors.joining(","));
|
|
|
WxMpTemplateDto wxMpTemplateDto = new WxMpTemplateDto();
|
|
|
wxMpTemplateDto.setOpenid(openidS);
|
|
|
wxMpTemplateDto.setTenantId(task.getTenantId());
|
|
|
- wxMpTemplateDto.setType("1");
|
|
|
+ wxMpTemplateDto.setType("2");
|
|
|
wxMpTemplateDto.setPagePath("pages/tabBar/task/list");
|
|
|
wxMpTemplateDto.setData(data);
|
|
|
String rest = wechatClient.sendMessageNew(wxMpTemplateDto);
|