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

Merge branch 'feature/REQ-7125' into dev

Browse Source
This commit is contained in:
wangli 2026-03-05 15:34:45 +08:00
commit d829d250b8
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/OmsWorkspaceProperty.java
View File

@ -27,4 +27,7 @@ public class OmsWorkspaceProperty {
@Value("${oms-workspace.nodeId}")
private Long nodeId;
@Value("${oms-workspace.defaultAvatarUrl:https://axzo-public.oss-cn-chengdu.aliyuncs.com/app/app/1d718eb672a44247a6e530548dc0100f.svg}")
private String defaultAvatarUrl;
}

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

@ -456,12 +456,12 @@ public class BpmnProcessInstanceController extends BasicPopulateAvatarController
// 脱敏头像
if (Objects.nonNull(i.getAssigneeSnapshot()) && Objects.equals(i.getAssigneeSnapshot().getTenantId(), String.valueOf(omsWorkspaceProperty.getWorkspaceId()))) {
// 目前该节点是单人审批
i.getAssigneeSnapshot().setAvatar("https://axzo-public.oss-cn-chengdu.aliyuncs.com/app/app/1d718eb672a44247a6e530548dc0100f.svg");
i.getAssigneeSnapshot().setAvatar(omsWorkspaceProperty.getDefaultAvatarUrl());
} else if (!CollectionUtils.isEmpty(i.getForecastAssignees())) {
i.getForecastAssignees().stream()
.filter(j -> Objects.equals(j.getTenantId(), String.valueOf(omsWorkspaceProperty.getWorkspaceId())))
.forEach(j -> {
j.setAvatar("https://axzo-public.oss-cn-chengdu.aliyuncs.com/app/app/1d718eb672a44247a6e530548dc0100f.svg");
j.setAvatar(omsWorkspaceProperty.getDefaultAvatarUrl());
});
}
} else {
@ -469,26 +469,30 @@ public class BpmnProcessInstanceController extends BasicPopulateAvatarController
if (Objects.nonNull(i.getAssigneeSnapshot()) && Objects.equals(i.getAssigneeSnapshot().getTenantId(), String.valueOf(omsWorkspaceProperty.getWorkspaceId()))) {
// 目前该节点是单人审批
i.getAssigneeSnapshot().setAssignerName("");
i.getAssigneeSnapshot().setAvatar("https://axzo-public.oss-cn-chengdu.aliyuncs.com/app/app/1d718eb672a44247a6e530548dc0100f.svg");
i.getAssigneeSnapshot().setAvatar(omsWorkspaceProperty.getDefaultAvatarUrl());
i.setOperationDesc(i.getResult().getDesc());
} else if (!CollectionUtils.isEmpty(i.getForecastAssignees())) {
i.getForecastAssignees().stream()
.filter(j -> Objects.equals(j.getTenantId(), String.valueOf(omsWorkspaceProperty.getWorkspaceId())))
.forEach(j -> {
j.setAssignerName("");
j.setAvatar("https://axzo-public.oss-cn-chengdu.aliyuncs.com/app/app/1d718eb672a44247a6e530548dc0100f.svg");
j.setAvatar(omsWorkspaceProperty.getDefaultAvatarUrl());
i.setOperationDesc(i.getResult().getDesc());
});
}
}
} else {
if (Objects.nonNull(i.getAssigneeSnapshot()) && Objects.equals(i.getAssigneeSnapshot().getTenantId(), String.valueOf(omsWorkspaceProperty.getWorkspaceId()))) {
i.getAssigneeSnapshot().setAssignerName("");
i.getAssigneeSnapshot().setAvatar(omsWorkspaceProperty.getDefaultAvatarUrl());
}
// 未来节点
if (!CollectionUtils.isEmpty(i.getForecastAssignees())) {
i.getForecastAssignees().stream()
.filter(j -> Objects.equals(j.getTenantId(), String.valueOf(omsWorkspaceProperty.getWorkspaceId())))
.forEach(j -> {
j.setAssignerName("");
j.setAvatar("https://axzo-public.oss-cn-chengdu.aliyuncs.com/app/app/1d718eb672a44247a6e530548dc0100f.svg");
j.setAvatar(omsWorkspaceProperty.getDefaultAvatarUrl());
});
}
}