From dd3ba339246a101d5cf6a2330699f31a037dd28a Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 15 Dec 2023 16:46:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ESAnnualInitController.java | 4 +--- .../impl/ProcessEsAnnualInitServiceImpl.java | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java index 2d958ba3..cf813cf5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java @@ -3,7 +3,6 @@ package com.jero.modules.activiti.process.esAnnualInit.controller; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.aspect.annotation.Translation; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.util.MessageUtils; @@ -13,7 +12,6 @@ import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit; import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO; import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualInitService; -import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import io.swagger.annotations.*; @@ -131,7 +129,7 @@ public class ESAnnualInitController { /** * 批量驳回 * - * @param ids + * @param annualInitData */ @AutoLog(value = "企标年度制修订标准化发起流程-批量驳回") @ApiOperation(value="企标年度制修订标准化发起流程-批量驳回", notes="企标年度制修订标准化发起流程-批量驳回") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index ac6e341a..0705a404 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -185,7 +185,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); String taskName = task.getName(); + String contactUser = (String) runtimeService.getVariable(executionId, "contactUser"); + String workGroupUser = (String) runtimeService.getVariable(executionId, "workGroupUser"); switch (taskName) { case CONTACT_USER_SELECT: wrapper.eq(ProcessEsAnnualInit::getContactUser, userId); @@ -218,8 +220,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl d.setRejectFlag(YesOrNoEnum.NO.getValue())); - List approvalUserList = new ArrayList<>(); - dataList.forEach(d -> approvalUserList.add(d.getApprovalUser())); - taskService.setVariable(taskId, "approvalUserList", approvalUserList); + Set approvalUserSet = new HashSet<>(); + dataList.forEach(d -> approvalUserSet.add(d.getApprovalUser())); + taskService.setVariable(taskId, "approvalUserList", approvalUserSet); dataList.forEach(data -> data.setExecutionId(executionId)); saveOrUpdateBatch(dataList); } else { @@ -300,10 +302,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl d.setRejectFlag(YesOrNoEnum.NO.getValue())); // 设置本地变量 - List mainDraftUserList = new ArrayList<>(); - dataList.forEach(d -> mainDraftUserList.add(d.getPrcMainDraftUser())); + Set mainDraftUserSet = new HashSet<>(); + dataList.forEach(d -> mainDraftUserSet.add(d.getPrcMainDraftUser())); dataList.forEach(data -> data.setExecutionId(executionId)); - taskService.setVariable(taskId, "mainDraftUserList", mainDraftUserList); + taskService.setVariable(taskId, "mainDraftUserList", mainDraftUserSet); } else { dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue())); }