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

feat(REQ-4468) - 优化审批人冗余信息查询逻辑

Browse Source
This commit is contained in:
wangli 2025-07-01 20:29:12 +08:00
parent f398cfb0ba
commit b2df7dfbed
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/OrgStructureSnapshotInfo.java
View File

@ -51,11 +51,6 @@ public class OrgStructureSnapshotInfo implements Serializable {
/**
* 项目快照信息
*/
private OrgSnapshotInfo projectInfo;
/**
* 企业快照信息
*/
private OrgSnapshotInfo entInfo;
private OrgSnapshotInfo snapshotInfo;
}

16
workflow-engine-server/src/main/java/cn/axzo/workflow/server/engine/ext/listener/TaskEntityEventHandle.java
View File

@ -171,11 +171,11 @@ public class TaskEntityEventHandle implements EntityEventHandle<TaskEntity> {
assignee.setNodeId(String.valueOf(firstNodeUser.getTopNodeId()));
OrgStructureSnapshotInfo snapshotInfo = builder.personName(firstNodeUser.getRealName())
.avatarUrl(firstNodeUser.getPersonProfile().getAvatarUrl())
.avatarUrl(Objects.nonNull(firstNodeUser.getPersonProfile())? firstNodeUser.getPersonProfile().getAvatarUrl(): "")
.phone(firstNodeUser.getPhone())
.topNodeId(firstNodeUser.getTopNodeId())
.workspaceType(firstNodeUser.getWorkspace().getType())
.projectInfo(Objects.nonNull(firstNodeUser.getCooperateShip()) ? OrgSnapshotInfo.builder()
.snapshotInfo(Objects.nonNull(firstNodeUser.getCooperateShip()) ? OrgSnapshotInfo.builder()
.workspaceName(firstNodeUser.getCooperateShip().getWorkspaceName())
.workspaceId(String.valueOf(firstNodeUser.getCooperateShip().getWorkspaceId()))
.workspaceType(firstNodeUser.getCooperateShip().getWorkspaceType())
@ -183,21 +183,11 @@ public class TaskEntityEventHandle implements EntityEventHandle<TaskEntity> {
.ouName(firstNodeUser.getCooperateShip().getOrganizationalUnitName())
.ouId(String.valueOf(firstNodeUser.getCooperateShip().getOrganizationalUnitId()))
.topNodeId(String.valueOf(firstNodeUser.getTopNodeId()))
.jobInfos(nodeUsers.stream().map(i -> JobInfo.builder()
.jobInfos(ListUtils.emptyIfNull(nodeUsers).stream().map(i -> JobInfo.builder()
.jobCode(i.getJob().getCode())
.jobName(i.getJob().getName())
.build()).collect(Collectors.toList()))
.build() : null)
.entInfo(Objects.nonNull(firstNodeUser.getEntCooperateShip()) ? OrgSnapshotInfo.builder()
.workspaceName(firstNodeUser.getEntCooperateShip().getWorkspaceName())
.workspaceId(String.valueOf(firstNodeUser.getEntCooperateShip().getWorkspaceId()))
.workspaceType(firstNodeUser.getEntCooperateShip().getWorkspaceType())
.cooperationType(firstNodeUser.getEntCooperateShip().getCooperateType())
.ouName(firstNodeUser.getEntCooperateShip().getOrganizationalUnitName())
.ouId(String.valueOf(firstNodeUser.getEntCooperateShip().getOrganizationalUnitId()))
.topNodeId(String.valueOf(firstNodeUser.getTopNodeId()))
.jobInfos(Lists.newArrayList())
.build() : null)
.build();
FlowElement flowElement = ProcessDefinitionUtil.getBpmnModel(taskEntity.getProcessDefinitionId()).getFlowElement(taskEntity.getTaskDefinitionKey());