From 41f250afe168ef5e064a2d724a54e05e0275f997 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 3 Mar 2023 23:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E5=B1=80=E8=81=94=E5=AE=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/organization/controller/ProcDefController.java | 2 +-
 .../pmapi/projectdeclared/controller/DeclaredProjectController.java | 1 +
 .../java/com/ningdatech/pmapi/scheduler/task/InitProcessTask.java   | 3 ++-
 .../com/ningdatech/pmapi/sys/controller/SysProcDefController.java   | 6 +++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java
index e36a119..27ed7ca 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java
@@ -66,7 +66,7 @@ public class ProcDefController {
     @ApiOperation(value = "单位流程配置部署", notes = "单位流程配置部署")
     @PostMapping("/deploy/{processDefId}")
     public String deploy(@Validated @PathVariable String processDefId) {
-        return orgProcessModelService.deployProcess(processDefId);
+        return orgProcessModelService.deployProcess(processDefId,null);
     }
 
     @ApiOperation(value = "单位流程配置删除", notes = "单位流程配置删除")
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java
index 7a1e34e..3881b56 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java
@@ -1,6 +1,7 @@
 package com.ningdatech.pmapi.projectdeclared.controller;
 
 import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage;
 import com.ningdatech.pmapi.projectdeclared.model.dto.DeclaredProjectListParamDTO;
 import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
 import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectDraftSaveDTO;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/InitProcessTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/InitProcessTask.java
index 6555193..bff8dd2 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/InitProcessTask.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/InitProcessTask.java
@@ -14,6 +14,7 @@ import com.ningdatech.pmapi.sys.service.IRegionService;
 import com.wflow.bean.dto.WflowModelHistorysDto;
 import com.wflow.bean.entity.WflowForms;
 import com.wflow.bean.entity.WflowModels;
+import com.wflow.workflow.bean.dto.OrgInfoDTO;
 import com.wflow.workflow.bean.process.ProcessNode;
 import com.wflow.workflow.service.ProcessModelService;
 import com.wflow.workflow.service.WflowFormsService;
@@ -122,7 +123,7 @@ public class InitProcessTask {
 
                     if(StringUtils.isNotBlank(processModelService.saveProcess(models))){
                         //初始的流程在部署表也存一份，用来查询
-                        if(StringUtils.isNotBlank(processModelService.deployProcess(models.getFormId()))){
+                        if(StringUtils.isNotBlank(processModelService.deployProcess(models.getFormId(),null))){
                             log.info("当前区域 【{}】 流程名[{}] 流程数据已经保存成功",region.getName(),formName);
                         }else{
                             log.info("当前区域 【{}】 流程名[{}] 流程数据保存失败",region.getName(),formName);
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java
index 72f43f1..2c50328 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java
@@ -1,6 +1,8 @@
 package com.ningdatech.pmapi.sys.controller;
 
 import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage;
+import com.ningdatech.pmapi.user.util.LoginUserUtil;
 import com.wflow.bean.dto.WflowModelHistorysDto;
 import com.wflow.bean.vo.WflowModelVo;
 import com.wflow.service.ModelGroupService;
@@ -30,6 +32,8 @@ public class SysProcDefController {
 
     private final ProcessModelService processModelService;
 
+    private final DefaultDeclaredProjectManage defaultDeclaredProjectManage;
+
     @ApiOperation(value = "系统流程配置列表", notes = "系统流程配置列表")
     @GetMapping("/list")
     public PageVo<WflowModelVo> list(@RequestParam String regionCode, @RequestParam(defaultValue = "1") Integer pageNumber,
@@ -60,6 +64,6 @@ public class SysProcDefController {
     @ApiOperation(value = "系统流程配置发布", notes = "系统流程配置发布")
     @PostMapping("/deploy/{formId}")
     public String deploy(@Validated @PathVariable String formId) {
-         return processModelService.deployProcess(formId);
+         return processModelService.deployProcess(formId,null);
     }
 }