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

feat(REQ-3340) - 优化审批日志中的人的模型

Browse Source
This commit is contained in:
wangli 2025-02-19 16:12:09 +08:00
parent 05f4be0868
commit a6f64724e3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
View File

@ -38,7 +38,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.flowable.engine.history.HistoricProcessInstance;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@ -60,6 +59,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static cn.azxo.framework.common.model.CommonResponse.success;
@ -353,7 +353,12 @@ public class BpmnProcessInstanceController extends BasicPopulateAvatarController
}
private void resetPersonInfo(BpmnProcessInstanceLogVO log) {
List<BpmnTaskDelegateAssigner> users = log.getTaskDetails().stream().map(BpmnTaskInstanceLogVO::getAssigneeSnapshot).filter(Objects::nonNull).filter(e -> NumberUtils.isNumber(e.getPersonId())).collect(Collectors.toList());
List<BpmnTaskDelegateAssigner> users = log.getTaskDetails().stream().flatMap(taskLog -> {
Stream<BpmnTaskDelegateAssigner> assigner = Objects.nonNull(taskLog.getAssigneeSnapshot()) ? Stream.of(taskLog.getAssigneeSnapshot()) : Stream.empty();
Stream<BpmnTaskDelegateAssigner> forecastAssignees = CollectionUtils.isEmpty(taskLog.getForecastAssignees()) ? Stream.empty() : taskLog.getForecastAssignees().stream();
return Stream.concat(assigner, forecastAssignees);
}).collect(Collectors.toList());
// List<BpmnTaskDelegateAssigner> users = log.getTaskDetails().stream().map(BpmnTaskInstanceLogVO::getAssigneeSnapshot).filter(Objects::nonNull).filter(e -> NumberUtils.isNumber(e.getPersonId())).collect(Collectors.toList());
users.add(log.getInitiator());
populateUsersAvatar(users);
// users.stream().collect(Collectors.toMap(BpmnTaskDelegateAssigner::getPersonId, Function.identity(), (s,t)->s))