wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2924) - 完善节点多人时的响应数据处理

Browse Source
This commit is contained in:
wangli 2024-09-25 10:08:27 +08:00
parent 1c5acfd728
commit 1a90c25252
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -1140,7 +1140,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
// 比对抄送人 // 比对抄送人
logVO.getTaskDetails().stream() logVO.getTaskDetails().stream()
.filter(i -> Objects.equals(i.getNodeType(), NODE_CARBON_COPY)) .filter(i -> Objects.equals(i.getNodeType(), NODE_CARBON_COPY))
.flatMap(i -> i.getForecastAssignees().stream()) .flatMap(i -> ListUtils.emptyIfNull(i.getForecastAssignees()).stream())
.filter(i -> i.buildAssigneeId().contains(ge130Assignee) || Objects.equals(i.buildAssigneeId_1_2_1(), le130Assignee)) .filter(i -> i.buildAssigneeId().contains(ge130Assignee) || Objects.equals(i.buildAssigneeId_1_2_1(), le130Assignee))
.findAny() .findAny()
.ifPresent(i -> authorizedButtons.addAll(chooseButtons(logVO, CONFIG_BUTTON_TYPE_CARBON_COPY))); .ifPresent(i -> authorizedButtons.addAll(chooseButtons(logVO, CONFIG_BUTTON_TYPE_CARBON_COPY)));
@ -1210,9 +1210,19 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
getFutureTasks(forecasting, tasks); getFutureTasks(forecasting, tasks);
// 处理是否加密 // 处理是否加密
handleEncrypt(dto.getEncrypt(), tasks); handleEncrypt(dto.getEncrypt(), tasks);
// reset field forecastAssignees Empty to null;
resetCollectionToNull(tasks);
return tasks; return tasks;
} }
private void resetCollectionToNull(List<BpmnTaskInstanceLogVO> tasks) {
tasks.forEach(i-> {
if(ListUtils.emptyIfNull(i.getForecastAssignees()).isEmpty()) {
i.setForecastAssignees(null);
}
});
}
private static void handleEncrypt(Boolean encrypt, List<BpmnTaskInstanceLogVO> tasks) { private static void handleEncrypt(Boolean encrypt, List<BpmnTaskInstanceLogVO> tasks) {
if (Boolean.FALSE.equals(encrypt)) { if (Boolean.FALSE.equals(encrypt)) {
return; return;
@ -1230,7 +1240,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
i.setOperationDesc("已处理"); i.setOperationDesc("已处理");
} }
// 统一将多人节点数据全部置空 // 统一将多人节点数据全部置空
i.setForecastAssignees(Collections.emptyList()); i.setForecastAssignees(null);
// 统一将签名数据置空 // 统一将签名数据置空
i.setSignatureUrl(null); i.setSignatureUrl(null);
}); });