From 58f4de1b5a809f8644bd85948508177f5ad67b6c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 28 Mar 2025 18:08:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?-=E6=B5=81=E7=A8=8B=E5=8A=A8=E4=BD=9C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E6=88=90=E5=8A=9F=E5=88=A4=E6=96=AD=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E8=BE=BE=E5=BC=8F=E2=80=9C=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E2=80=9D=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1387041906982912]IT服务-流程动作设置中成功判断自定义表达式“为空”不生效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1387041906982912 --- .../SearchProcessTaskListForOwnerApi.java | 2 +- .../thread/ProcessTaskActionThread.java | 27 ++++++++++++------- 2 files changed, 18 insertions(+), 11 deletions(-) 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 082461fe9..03657726d 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 741db4ea8..eb735e485 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,22 +196,25 @@ 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 { String statusCode = String.valueOf(integrationResultVo.getStatusCode()); + System.out.println("statusCode = " + statusCode); if (statusCode.startsWith("2") || statusCode.startsWith("3")) { isSucceed = true; } @@ -242,6 +248,7 @@ public class ProcessTaskActionThread extends NeatLogicThread { processTaskActionMapper.insertProcessTaskAction(actionVo); currentProcessTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.RESTFULACTION.getParamName(), JSON.toJSONString(actionVo)); ProcessTaskAuditThread.audit(currentProcessTaskStepVo, ProcessTaskAuditType.RESTFULACTION); + break; } } } -- Gitee From 157e2cd36cc2e89275ab05d0ad05ae760bb03206 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 28 Mar 2025 18:09:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?-=E6=B5=81=E7=A8=8B=E5=8A=A8=E4=BD=9C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E6=88=90=E5=8A=9F=E5=88=A4=E6=96=AD=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E8=BE=BE=E5=BC=8F=E2=80=9C=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E2=80=9D=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1387041906982912]IT服务-流程动作设置中成功判断自定义表达式“为空”不生效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1387041906982912 --- .../neatlogic/module/process/thread/ProcessTaskActionThread.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java index eb735e485..2f59e0426 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java @@ -214,7 +214,6 @@ public class ProcessTaskActionThread extends NeatLogicThread { } } else { String statusCode = String.valueOf(integrationResultVo.getStatusCode()); - System.out.println("statusCode = " + statusCode); if (statusCode.startsWith("2") || statusCode.startsWith("3")) { isSucceed = true; } -- Gitee