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 bf3e9c5972e3994e56d749a514680bcdce4c3508..8c55b15167bd154eed1e225ba3cbc747cc376262 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 82fbdee748ce9d5c0f4e16383d990f8f4f642592..789a124f68d42fd7c71b3f04fa0787eddfea91df 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; } /**