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

feat(REQ-4468) - 兼容审批人冗余信息的逻辑，避免 NPE

Browse Source
This commit is contained in:
wangli 2025-07-02 20:24:24 +08:00
parent c9f34a5d97
commit b0d08caf60
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,7 @@ public class TaskEntityEventHandle implements EntityEventHandle<TaskEntity> {
assignee.setNodeId(String.valueOf(firstNodeUser.getTopNodeId()));
OrgStructureSnapshotInfo snapshotInfo = builder.personName(firstNodeUser.getRealName())
.avatarUrl(Objects.nonNull(firstNodeUser.getPersonProfile())? firstNodeUser.getPersonProfile().getAvatarUrl(): "")
.avatarUrl(Objects.nonNull(firstNodeUser.getPersonProfile()) ? firstNodeUser.getPersonProfile().getAvatarUrl() : "")
.phone(firstNodeUser.getPhone())
.topNodeId(firstNodeUser.getTopNodeId())
.workspaceType(firstNodeUser.getWorkspace().getType())
@ -183,10 +183,12 @@ public class TaskEntityEventHandle implements EntityEventHandle<TaskEntity> {
.ouName(firstNodeUser.getCooperateShip().getOrganizationalUnitName())
.ouId(String.valueOf(firstNodeUser.getCooperateShip().getOrganizationalUnitId()))
.topNodeId(String.valueOf(firstNodeUser.getTopNodeId()))
.jobInfos(ListUtils.emptyIfNull(nodeUsers).stream().map(i -> JobInfo.builder()
.jobCode(i.getJob().getCode())
.jobName(i.getJob().getName())
.build()).collect(Collectors.toList()))
.jobInfos(ListUtils.emptyIfNull(nodeUsers).stream()
.filter(i -> Objects.nonNull(i.getJob()))
.map(i -> JobInfo.builder()
.jobCode(i.getJob().getCode())
.jobName(i.getJob().getName())
.build()).collect(Collectors.toList()))
.build() : null)
.build();