|
@@ -1396,14 +1396,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
if (otherManagers.size() > 0) {
|
|
|
managerIds.addAll(otherManagers.stream().map(DepartmentOtherManager::getOtherManagerId).collect(Collectors.toList()));
|
|
|
}
|
|
|
- //获取部门负责人
|
|
|
- List<User> managers = userMapper.selectList(new QueryWrapper<User>().in("id", managerIds).eq("company_id", companyId));
|
|
|
- String managerUserIds = managers.stream().filter(m -> m.getCorpwxUserid() != null && !auditorCorpwxUserids.contains(m.getCorpwxUserid()))
|
|
|
- .map(User::getCorpwxUserid).collect(Collectors.joining("|"));
|
|
|
- if (!StringUtils.isEmpty(managerUserIds)) {
|
|
|
+ if (managerIds.size() > 0) {
|
|
|
+ //获取部门负责人
|
|
|
+ List<User> managers = userMapper.selectList(new QueryWrapper<User>().in("id", managerIds).eq("company_id", companyId));
|
|
|
+ String managerUserIds = managers.stream().filter(m -> m.getCorpwxUserid() != null && !auditorCorpwxUserids.contains(m.getCorpwxUserid()))
|
|
|
+ .map(User::getCorpwxUserid).collect(Collectors.joining("|"));
|
|
|
+ if (!StringUtils.isEmpty(managerUserIds)) {
|
|
|
// System.out.println("发送企业微信消息==用户:"+managerUserIds+", "+"员工$userName="+creator.getCorpwxUserid()+"$提交了日报");
|
|
|
- wxCorpInfoService.sendWXCorpMsg(wxCorpInfo, managerUserIds, "员工$userName="+creator.getCorpwxUserid()+"$提交了日报", null, WxCorpInfoServiceImpl.TEXT_CARD_MSG_REPORT_SUBMIT);
|
|
|
+ wxCorpInfoService.sendWXCorpMsg(wxCorpInfo, managerUserIds, "员工$userName="+creator.getCorpwxUserid()+"$提交了日报", null, WxCorpInfoServiceImpl.TEXT_CARD_MSG_REPORT_SUBMIT);
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|