Commit 13446b39 by “zcwang”

modify: 执行节点邮件接收优化

parent 01463113
Pipeline #45027 passed with stages
in 2 minutes 2 seconds
...@@ -311,12 +311,29 @@ public class ChangeFlowBiz { ...@@ -311,12 +311,29 @@ public class ChangeFlowBiz {
changeExecRecords.forEach(i -> { changeExecRecords.forEach(i -> {
ChangeExecuteEmailDTO changeExecuteEmailDTO = new ChangeExecuteEmailDTO(); ChangeExecuteEmailDTO changeExecuteEmailDTO = new ChangeExecuteEmailDTO();
changeExecuteEmailDTO.setChangeExecDepartment(i.getChangeExecDepartment()); changeExecuteEmailDTO.setChangeExecDepartment(i.getChangeExecDepartment());
changeExecuteEmailDTO.setChangeExecUser(i.getChangeExecUser()); changeExecuteEmailDTO.setChangeExecUser(i.getChangeExecUserEmail());
changeExecuteEmailDTO.setChangeRiskDesc(i.getChangeRiskDesc()); changeExecuteEmailDTO.setChangeRiskDesc(i.getChangeRiskDesc());
changeExecuteEmailDTO.setChangeExecProject(i.getChangeExecProject()); changeExecuteEmailDTO.setChangeExecProject(i.getChangeExecProject());
changeExecuteEmailDTO.setChangeChecking(i.getChangeChecking()); changeExecuteEmailDTO.setChangeChecking(i.getChangeChecking());
dataList.add(changeExecuteEmailDTO); dataList.add(changeExecuteEmailDTO);
}); });
// 邮件附件执行人改为名字+邮箱格式,没有的话兜底邮箱
List<String> changeExecUserList = dataList.stream().map(ChangeExecuteEmailDTO::getChangeExecUser).collect(Collectors.toList());
List<IusUserInfoRsp> iusUserInfoRsps = iusService.queryUserListInfo(UserQueryDTO.builder().uids(changeExecUserList).build());
dataList.stream().map(d -> {
Optional<IusUserInfoRsp> anyExeUser = iusUserInfoRsps.stream().filter(ius -> ius.getUid().equals(d.getChangeExecUser())).findAny();
String execUserName;
if (anyExeUser.isPresent()) {
execUserName = anyExeUser.get().getName();
} else {
// 批量查询没查到的人名,通过全量查询单独再查一次
IusUserInfoRsp iusUserInfo = iusService.queryUserInfo(d.getChangeExecUser());
execUserName = iusUserInfo == null || StringUtils.isBlank(user.getName()) ? "" : user.getName();
}
d.setChangeExecUser(execUserName + d.getChangeExecUser());
return d;
}).collect(Collectors.toList());
param.put("dataList", dataList); param.put("dataList", dataList);
String subjectParam = ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc() + changeType String subjectParam = ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc() + changeType
+ changeRecord.getFlowId().toString(); + changeRecord.getFlowId().toString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment