diff --git a/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptImportApi.java b/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptImportApi.java index 73b36076ddcff8770511f5fef946703e378dadf3..7a1cd01b29810678a08578e83d62b69e4b227223 100644 --- a/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptImportApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptImportApi.java @@ -346,8 +346,6 @@ public class AutoexecScriptImportApi extends PrivateBinaryStreamApiComponentBase autoexecScriptMapper.updateScriptBaseInfo(scriptVo); } else { scriptVo.setFcu(UserContext.get().getUserUuid()); - scriptVo.setId(null); - id = scriptVo.getId(); autoexecScriptMapper.insertScript(scriptVo); } diff --git a/src/main/java/neatlogic/module/autoexec/importexport/handler/ScriptImportExportHandler.java b/src/main/java/neatlogic/module/autoexec/importexport/handler/ScriptImportExportHandler.java index 2f892eba38dfbbf324f2a152df9c9742b6afff37..e6e6085e460a7ccae97b29780028e23cf22ab481 100644 --- a/src/main/java/neatlogic/module/autoexec/importexport/handler/ScriptImportExportHandler.java +++ b/src/main/java/neatlogic/module/autoexec/importexport/handler/ScriptImportExportHandler.java @@ -39,6 +39,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.zip.ZipOutputStream; @@ -132,6 +133,19 @@ public class ScriptImportExportHandler extends ImportExportHandlerBase { version.setPackageFileId((Long) newPrimaryKey); } } + List useLib = version.getUseLib(); + if (CollectionUtils.isNotEmpty(useLib)) { + List newUseLib = new ArrayList<>(); + for (Long useLibId : useLib) { + Object newPrimaryKey = getNewPrimaryKey(AutoexecImportExportHandlerType.AUTOEXEC_SCRIPT, useLibId, primaryChangeList); + if (newPrimaryKey != null) { + newUseLib.add((Long) newPrimaryKey); + } else { + newUseLib.add(useLibId); + } + } + version.setUseLib(newUseLib); + } // 保存 version.setId(null);// 新增一个版本 version.setStatus(ScriptVersionStatus.DRAFT.getValue());