From b43b541cada3d7086f9756f6d272a032b5fea71b Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Thu, 4 Sep 2025 12:12:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D=20#[1500817822023680]=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E7=BB=84=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D?= =?UTF-8?q?=E9=83=BD=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E2=80=9D=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?00817822023680?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/job/node/UpdateNodesByOtherHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/neatlogic/module/inspect/job/node/UpdateNodesByOtherHandler.java b/src/main/java/neatlogic/module/inspect/job/node/UpdateNodesByOtherHandler.java index 29a5985..5c30c6a 100644 --- a/src/main/java/neatlogic/module/inspect/job/node/UpdateNodesByOtherHandler.java +++ b/src/main/java/neatlogic/module/inspect/job/node/UpdateNodesByOtherHandler.java @@ -20,7 +20,7 @@ package neatlogic.module.inspect.job.node; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.autoexec.crossover.IAutoexecJobCrossoverService; -import neatlogic.framework.autoexec.dto.combop.AutoexecCombopExecuteNodeConfigVo; +import neatlogic.framework.autoexec.dto.combop.AutoexecCombopExecuteConfigVo; import neatlogic.framework.autoexec.dto.job.AutoexecJobVo; import neatlogic.framework.autoexec.job.node.IUpdateNodes; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo; @@ -41,12 +41,12 @@ import java.util.Set; public class UpdateNodesByOtherHandler implements IUpdateNodes { @Override - public boolean update(AutoexecCombopExecuteNodeConfigVo executeNodeConfigVo, AutoexecJobVo jobVo, String userName, Long protocolId) { + public boolean update(AutoexecCombopExecuteConfigVo executeConfigVo, AutoexecJobVo jobVo, String userName, Long protocolId) { boolean isHasNode = false; - if (executeNodeConfigVo == null) { + if (executeConfigVo == null || executeConfigVo.getExecuteNodeConfig() == null) { return false; } - JSONObject otherFilter = executeNodeConfigVo.getOtherFilter(); + JSONObject otherFilter = executeConfigVo.getExecuteNodeConfig().getOtherFilter(); if (MapUtils.isNotEmpty(otherFilter)) { Long appSystemId = otherFilter.getLong("appSystemId"); Long appModuleId = otherFilter.getLong("appModuleId"); -- Gitee From 386ad7a80e7fd07c7bff804ec28ef0e404e7ff65 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Fri, 5 Sep 2025 17:29:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D=20#[1500817822023680]=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E7=BB=84=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D?= =?UTF-8?q?=E9=83=BD=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E2=80=9D=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?00817822023680?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/inspect/job/node/UpdateNodesByOtherHandler.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/neatlogic/module/inspect/job/node/UpdateNodesByOtherHandler.java b/src/main/java/neatlogic/module/inspect/job/node/UpdateNodesByOtherHandler.java index 5c30c6a..d22b110 100644 --- a/src/main/java/neatlogic/module/inspect/job/node/UpdateNodesByOtherHandler.java +++ b/src/main/java/neatlogic/module/inspect/job/node/UpdateNodesByOtherHandler.java @@ -43,9 +43,6 @@ public class UpdateNodesByOtherHandler implements IUpdateNodes { @Override public boolean update(AutoexecCombopExecuteConfigVo executeConfigVo, AutoexecJobVo jobVo, String userName, Long protocolId) { boolean isHasNode = false; - if (executeConfigVo == null || executeConfigVo.getExecuteNodeConfig() == null) { - return false; - } JSONObject otherFilter = executeConfigVo.getExecuteNodeConfig().getOtherFilter(); if (MapUtils.isNotEmpty(otherFilter)) { Long appSystemId = otherFilter.getLong("appSystemId"); -- Gitee