diff --git a/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskListForOwnerApi.java b/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskListForOwnerApi.java index 082461fe9949e4362ac7cf7ebb2e8d69cc331123..03657726d2e38d4c6a975875207dc3156ec77621 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskListForOwnerApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskListForOwnerApi.java @@ -81,7 +81,7 @@ public class SearchProcessTaskListForOwnerApi extends PrivateApiComponentBase { ProcessTaskSearchVo searchVo = paramObj.toJavaObject(ProcessTaskSearchVo.class); int rowNum = processTaskMapper.searchProcessTaskCountByOwnerAndExcludeId(searchVo); if (rowNum == 0) { - return TableResultUtil.getResult(new ArrayList(), searchVo); + return TableResultUtil.getResult(new ArrayList<>(), searchVo); } searchVo.setRowNum(rowNum); Map priorityMap = new HashMap<>(); diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java index 741db4ea8ec5388230b7299601e720883fc30ccb..2f59e0426900e450e698f10133829df2718e2702 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java @@ -31,7 +31,10 @@ import neatlogic.framework.integration.dto.IntegrationVo; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.notify.dto.ParamMappingVo; import neatlogic.framework.process.condition.core.ProcessTaskConditionFactory; -import neatlogic.framework.process.constvalue.*; +import neatlogic.framework.process.constvalue.ProcessFieldType; +import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; +import neatlogic.framework.process.constvalue.ProcessTaskAuditType; +import neatlogic.framework.process.constvalue.ProcessTaskParams; import neatlogic.framework.process.dto.ProcessTaskActionVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; @@ -193,18 +196,20 @@ public class ProcessTaskActionThread extends NeatLogicThread { } } } + List curentValueList = new ArrayList<>(); if (resultValue != null) { - List curentValueList = new ArrayList<>(); curentValueList.add(resultValue); - String value = successConditionObj.getString("value"); - List targetValueList = new ArrayList<>(); + } + List targetValueList = new ArrayList<>(); + String value = successConditionObj.getString("value"); + if (StringUtils.isNotBlank(value)) { targetValueList.add(value); - String expression = successConditionObj.getString("expression"); - isSucceed = ConditionUtil.predicate(curentValueList, expression, targetValueList); - if (!isSucceed) { - String expressionName = Expression.getExpressionName(expression); - failedReason = String.format("不满足成功条件:%s%s%s", name, expressionName, value); - } + } + String expression = successConditionObj.getString("expression"); + isSucceed = ConditionUtil.predicate(curentValueList, expression, targetValueList); + if (!isSucceed) { + String expressionName = Expression.getExpressionName(expression); + failedReason = String.format("不满足成功条件:%s%s%s", name, expressionName, value); } } } else { @@ -242,6 +247,7 @@ public class ProcessTaskActionThread extends NeatLogicThread { processTaskActionMapper.insertProcessTaskAction(actionVo); currentProcessTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.RESTFULACTION.getParamName(), JSON.toJSONString(actionVo)); ProcessTaskAuditThread.audit(currentProcessTaskStepVo, ProcessTaskAuditType.RESTFULACTION); + break; } } }