From ce67e4a3e2799090984dd66fd55d1342c533e82a Mon Sep 17 00:00:00 2001 From: Echo <4759156@qq.com> Date: Mon, 15 Apr 2024 15:53:53 +0800 Subject: [PATCH] =?UTF-8?q?bpm=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E6=B5=81=E7=A8=8B=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java | 2 +- .../yudao/module/bpm/service/task/BpmTaskServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java index 6f25d725..18e3b490 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java @@ -121,7 +121,7 @@ public interface BpmTaskConvert { AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId())); respVO.setProcessInstance(convert(processInstance, startUser)); } - AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee())); + AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(StrUtil.isEmpty(task.getAssignee())?task.getOwner():task.getAssignee())); if (assignUser != null) { respVO.setAssigneeUser(convert3(assignUser)); DeptRespDTO dept = deptMap.get(assignUser.getDeptId()); diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java index e8107e23..0bbde32a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java @@ -320,7 +320,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { // 获得 ProcessInstance Map HistoricProcessInstance processInstance = processInstanceService.getHistoricProcessInstance(processInstanceId); // 获得 User Map - Set userIds = convertSet(tasks, task -> NumberUtils.parseLong(task.getAssignee())); + Set userIds = convertSet(tasks, task -> NumberUtils.parseLong(StrUtil.isEmpty(task.getAssignee())?task.getOwner():task.getAssignee())); userIds.add(NumberUtils.parseLong(processInstance.getStartUserId())); Map userMap = adminUserApi.getUserMap(userIds); // 获得 Dept Map