From b96c1821cbc17dff22400b2ec0d9581ced8c1119 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 8 Dec 2025 16:19:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B7=A5=E5=85=B7=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E6=97=B6=EF=BC=8C=E5=8F=AA=E5=A4=8D=E5=88=B6=E6=BF=80?= =?UTF-8?q?=E6=B4=BB=E7=89=88=E6=9C=AC=EF=BC=8C=E5=8E=86=E5=8F=B2=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=8D=E7=94=A8=E4=BF=9D=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1553533537583104]自动化自定义工具复制时，只复制激活版本，历史版本不用保留 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1553533537583104 --- .../autoexec/api/script/AutoexecScriptCopyApi.java | 2 +- .../autoexec/service/AutoexecScriptServiceImpl.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptCopyApi.java b/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptCopyApi.java index bf3e9c59..8c55b151 100644 --- a/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptCopyApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptCopyApi.java @@ -92,7 +92,7 @@ public class AutoexecScriptCopyApi extends PrivateApiComponentBase { autoexecScriptService.validateScriptBaseInfo(targetScript); autoexecScriptMapper.insertScript(targetScript); - // 复制所有已通过版本 + // 复制所有已通过版本-->20251208改成只复制当前版本 List sourceVersionList = autoexecScriptService .getScriptVersionDetailListByScriptId(new AutoexecScriptVersionVo(sourceScript.getId(), ScriptVersionStatus.PASSED.getValue())); if (CollectionUtils.isNotEmpty(sourceVersionList)) { diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecScriptServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecScriptServiceImpl.java index 82fbdee7..789a124f 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecScriptServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecScriptServiceImpl.java @@ -108,10 +108,11 @@ public class AutoexecScriptServiceImpl implements AutoexecScriptService { @Override public List getScriptVersionDetailListByScriptId(AutoexecScriptVersionVo vo) { + List resultList = new ArrayList<>(); List versionList = autoexecScriptMapper.getVersionListIncludeLineByScriptId(vo); if (CollectionUtils.isNotEmpty(versionList)) { - - List versionIdList = versionList.stream().map(AutoexecScriptVersionVo::getId).collect(Collectors.toList()); + // 20251208改成只复制当前版本 + List versionIdList = versionList.stream().filter(Objects::nonNull).filter(e -> Objects.equals(e.getIsActive(), 1)).map(AutoexecScriptVersionVo::getId).collect(Collectors.toList()); Map argumentMap = new HashMap<>(); Map> paramMap = new HashMap<>(); Map> useLibMap = new HashMap<>(); @@ -133,16 +134,17 @@ public class AutoexecScriptServiceImpl implements AutoexecScriptService { useLibNameMap = versionVoIncludeUseLibNameList.stream().collect(Collectors.toMap(AutoexecScriptVersionVo::getId, AutoexecScriptVersionVo::getUseLibName)); } - if (CollectionUtils.isNotEmpty(versionList)) { - for (AutoexecScriptVersionVo version : versionList) { + for (AutoexecScriptVersionVo version : versionList) { + if (versionIdList.contains(version.getId())) { version.setParamList(paramMap.get(version.getId())); version.setArgument(argumentMap.get(version.getId())); version.setUseLib(useLibMap.get(version.getId())); version.setUseLibName(useLibNameMap.get(version.getId())); + resultList.add(version); } } } - return versionList; + return resultList; } /** -- Gitee