|
|
@ -367,17 +367,32 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
|
|
|
|
|
// 判断流程是否结束
|
|
|
|
flowTask.setProcessEndTime(processInstance.get("END_TIME_") == null ? "" : "end"); |
|
|
|
|
|
|
|
List<TaskUserInfo> taskUserInfos = new ArrayList<>(); |
|
|
|
// 处理审批人员
|
|
|
|
if (StringUtils.isNotBlank(histIns.getAssignee()) && finalUserMap.containsKey(histIns.getAssignee())) { |
|
|
|
SysUserVo user = finalUserMap.get(histIns.getAssignee()); |
|
|
|
if (StringUtils.isNotBlank(histIns.getAssignee())) { |
|
|
|
/* SysUserVo user = finalUserMap.get(histIns.getAssignee()); |
|
|
|
if (user != null) { |
|
|
|
TaskUserInfo taskUserInfo = new TaskUserInfo(); |
|
|
|
taskUserInfo.setAssigneeName(user.getName()); |
|
|
|
taskUserInfo.setAssigneeSid(user.getSid()); |
|
|
|
taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() + user.getHeadImage()); |
|
|
|
flowTask.setTaskUserInfos(Collections.singletonList(taskUserInfo)); |
|
|
|
}*/ |
|
|
|
List<String> stringList = Arrays.asList(histIns.getAssignee().split(",")); |
|
|
|
for (int i = 0; i < stringList.size(); i++) { |
|
|
|
SysUserVo user = finalUserMap.get(stringList.get(i)); |
|
|
|
if (user != null) { |
|
|
|
TaskUserInfo taskUserInfo = new TaskUserInfo(); |
|
|
|
taskUserInfo.setAssigneeName(user.getName()); |
|
|
|
taskUserInfo.setAssigneeSid(user.getSid()); |
|
|
|
taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() + user.getHeadImage()); |
|
|
|
taskUserInfos.add(taskUserInfo); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
flowTask.setTaskUserInfos(taskUserInfos); |
|
|
|
|
|
|
|
} |
|
|
|
// 处理意见评论内容
|
|
|
|
if (commentList != null && !commentList.isEmpty()) { |
|
|
|