From d5047cec0b6521f8c84546ad67c76a74806eba03 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 14 Aug 2024 14:47:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=8C=87=E6=B4=BE=E5=89=8D=E7=BD=AE=E6=AD=A5=E9=AA=A4=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=80=89=E6=B2=A1=E6=9C=89=E5=A4=84=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E6=AD=A5=E9=AA=A4=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1223065063620608]后端-指派前置步骤不能选没有处理人的步骤指定 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1223065063620608 --- .../process/stephandler/component/EndProcessComponent.java | 5 +++++ .../process/stephandler/component/StartProcessComponent.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java index ac73c0cfe..2c28a2011 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java @@ -212,4 +212,9 @@ public class EndProcessComponent extends ProcessStepHandlerBase { return 0; } + @Override + public boolean disableAssign() { + return true; + } + } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/StartProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/StartProcessComponent.java index 026678d6f..b1694e25b 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/StartProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/StartProcessComponent.java @@ -196,4 +196,9 @@ public class StartProcessComponent extends ProcessStepHandlerBase { return 0; } + @Override + public boolean disableAssign() { + return true; + } + } -- Gitee From 20805866add932114440514e7d6fa641674d910e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 15 Aug 2024 11:26:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=8C=87=E6=B4=BE=E5=89=8D=E7=BD=AE=E6=AD=A5=E9=AA=A4=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=80=89=E6=B2=A1=E6=9C=89=E5=A4=84=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E6=AD=A5=E9=AA=A4=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1223065063620608]后端-指派前置步骤不能选没有处理人的步骤指定 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1223065063620608 --- .../stephandler/component/AutomaticProcessComponent.java | 5 +++++ .../stephandler/component/ConditionProcessComponent.java | 4 ++-- .../stephandler/component/DistributaryProcessComponent.java | 4 ++-- .../process/stephandler/component/EndProcessComponent.java | 4 ++-- .../process/stephandler/component/StartProcessComponent.java | 4 ++-- .../process/stephandler/component/TimerProcessComponent.java | 5 +++++ 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java index 985dbad8d..299373394 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java @@ -384,4 +384,9 @@ public class AutomaticProcessComponent extends ProcessStepHandlerBase { public boolean disableAssign() { return true; } + + @Override + public boolean allowDispatchStepWorker() { + return false; + } } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java index dea3418d5..040c278e2 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java @@ -443,8 +443,8 @@ public class ConditionProcessComponent extends ProcessStepHandlerBase { } @Override - public boolean disableAssign() { - return true; + public boolean allowDispatchStepWorker() { + return false; } } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/DistributaryProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/DistributaryProcessComponent.java index d7abaaa5c..ef039bf55 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/DistributaryProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/DistributaryProcessComponent.java @@ -183,8 +183,8 @@ public class DistributaryProcessComponent extends ProcessStepHandlerBase { } @Override - public boolean disableAssign() { - return true; + public boolean allowDispatchStepWorker() { + return false; } } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java index 2c28a2011..7baadceef 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java @@ -213,8 +213,8 @@ public class EndProcessComponent extends ProcessStepHandlerBase { } @Override - public boolean disableAssign() { - return true; + public boolean allowDispatchStepWorker() { + return false; } } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/StartProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/StartProcessComponent.java index b1694e25b..84521635b 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/StartProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/StartProcessComponent.java @@ -197,8 +197,8 @@ public class StartProcessComponent extends ProcessStepHandlerBase { } @Override - public boolean disableAssign() { - return true; + public boolean allowDispatchStepWorker() { + return false; } } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java index 2c72b57aa..4cae21f71 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java @@ -415,4 +415,9 @@ public class TimerProcessComponent extends ProcessStepHandlerBase { public boolean disableAssign() { return true; } + + @Override + public boolean allowDispatchStepWorker() { + return false; + } } -- Gitee From 71771e8e86b1ebea7e85d55104b1fce12218b333 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 15 Aug 2024 11:27:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=8C=87=E6=B4=BE=E5=89=8D=E7=BD=AE=E6=AD=A5=E9=AA=A4=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=80=89=E6=B2=A1=E6=9C=89=E5=A4=84=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E6=AD=A5=E9=AA=A4=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1223065063620608]后端-指派前置步骤不能选没有处理人的步骤指定 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1223065063620608 --- .../process/api/process/ProcessDraftListApi.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessDraftListApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessDraftListApi.java index 2a58f2e16..8c3b76704 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessDraftListApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessDraftListApi.java @@ -1,5 +1,6 @@ package neatlogic.module.process.api.process; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; @@ -10,6 +11,7 @@ import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.process.dao.mapper.process.ProcessMapper; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -46,11 +48,13 @@ public class ProcessDraftListApi extends PrivateApiComponentBase { @Description(desc = "流程草稿列表接口，最后更新时间2020-02-18 14:55，修改参数说明及输出参数列表") @Override public Object myDoService(JSONObject jsonObj) throws Exception { + String processUuid = jsonObj.getString("processUuid"); + if (StringUtils.isBlank(processUuid)) { + return new JSONArray(); + } ProcessDraftVo processDraftVo = new ProcessDraftVo(); processDraftVo.setFcu(UserContext.get().getUserUuid(true)); - if(jsonObj.containsKey("processUuid")) { - processDraftVo.setProcessUuid(jsonObj.getString("processUuid")); - } + processDraftVo.setProcessUuid(processUuid); return processMapper.getProcessDraftList(processDraftVo); } -- Gitee