From 086266badbc2e708fb010a417f95783160614aa8 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Sat, 18 Feb 2023 09:33:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E7=9A=84=E5=8F=98=E9=87=8F=E5=90=8D=20assign?= =?UTF-8?q?ee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/homepage/service/impl/HomePageServiceImpl.java | 2 ++ .../workflow/process/service/impl/WfProcessService.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java index cfe492b..9f949d0 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java @@ -95,6 +95,8 @@ public class HomePageServiceImpl implements IHomePageService { HistoricProcessInstanceQuery thisDayStartProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery() .processInstanceTenantId(WfTaskUtil.getTenantId()) .startedAfter(DateUtil.toDate(LocalDate.now())); + + //3.2.遍历流程，得到流程发起人，只要流程发起人的dept在当前用户所属的dept列表中，就计算一次 int todayAddNum = 0; List thisDayStartProcessInstanceList = thisDayStartProcessInstanceQuery.list(); diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfProcessService.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfProcessService.java index 13ebef2..2899f99 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfProcessService.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfProcessService.java @@ -100,14 +100,16 @@ public class WfProcessService implements IWfProcessService { variables.put(WfProcessConstant.TASK_VARIABLE_APPLY_USER, userId); variables.put(WfProcessConstant.TASK_CREATE_ROLE, createRoleName); - //如果是技术员发起的一般任务，直接指定assign = 公司 + //如果是技术员发起的一般任务，直接指定assignee = 公司 if(Func.equals(createRoleName, WfProcessConstant.COMMENT_ROLE_NAME) && Func.equals(variables.get("$renwudengji"), WfProcessConstant.COMMENT_TASK_LEVEL)){ - variables.put("assign",variables.get("yunweigongsi")); + variables.put("assignee",variables.get("yunweigongsi")); } // 启动流程 identityService.setAuthenticatedUserId(userId); ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, definition.getKey(), variables); + + return handleProcessInstance(processInstance, variables); }