From 928437412c0e91206015901d27409038a88b6892 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 12 Oct 2023 14:55:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E8=8A=82=E7=82=B9=E4=B8=8D=E8=87=AA=E5=8A=A8=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/process/common/service/ActFlowCommonService.java | 1 + .../process/esInitChange/entity/ProcessEsInitChange.java | 3 --- .../service/impl/ProcessEsInitChangeServiceImpl.java | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 674a1233..69ebc584 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -57,6 +57,7 @@ public class ActFlowCommonService { Map variables = customService.setVariables(businessId); // 第一个节点默认通过 variables.put("pass", true); + variables.put("createUser", UserUtils.getUserId()); // 启动流程 ProcessInstance processInstance = runtimeService.startProcessInstanceById(latestProcessDefinition.getId(), variables); // 流程实例ID diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index d48b54f9..38b68bce 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java @@ -15,8 +15,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotBlank; - /** * 企标计划 * @TableName process_es_init_change @@ -128,7 +126,6 @@ public class ProcessEsInitChange implements Serializable { /** * 企业标准代号 */ - @NotBlank private String enStandardCode; /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index 08adfee9..9192db3a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -54,7 +54,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl setVariables(ProcessEsInitChange initChange) { Map map = new HashMap<>(); // 设置流程中各个节点的人 - map.put("createUser", initChange.getCreateBy()); map.put("contactUser", initChange.getContactUser()); map.put("standardExpertList", Optional.ofNullable(initChange.getStandardExpert()).map(s -> Arrays.asList(s.split(","))).orElse(Collections.emptyList())); map.put("mainDraftUserLeader", initChange.getMainDraftUserLeader());