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 2a58f2e16dce44fe9a1339838ff5baa6ee4afda9..8c3b7670409f907e0f05ebf6b99c821b1095d5f4 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); } 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 985dbad8d1ca5b9a577fd15edec4f4c1d115aaf9..2993733946f5ab69b7b4f8c1d6f75cdc13241cc5 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 dea3418d526a8c2f4d6b9c4f6ce34000eec6e799..040c278e212f7cab4e82998bc79901bb9db13117 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 d7abaaa5cef28b4fde9f3b7389e04efbbd5710ae..ef039bf5520ddee3f24e3d2f7249db8d47101988 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 ac73c0cfe9e59c8ede363b24f5952ef1ca28a0c7..7baadceef3a62f3347d78b2aac53766cdad811f5 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 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 026678d6f289df8fe3d19a290491a637ecdbf700..84521635b4f345a3f5d5c81490920114e1298f5f 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 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 2c72b57aad866640af7163872a9abde33f59e7d7..4cae21f711363505984af2db598aaaac5c21b207 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; + } }