From a5d887fc687ad6c7607b8dde5b1f835782c3af59 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 21 Apr 2025 07:49:02 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B7=A5=E5=85=B7=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E4=BE=9D=E8=B5=96=E5=BA=93=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1391199326273536]导入自定义工具的时候，依赖库无法导入 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1391199326273536
---
 .../api/script/AutoexecScriptImportApi.java        |  2 --
 .../handler/ScriptImportExportHandler.java         | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

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 73b36076..7a1cd01b 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 2f892eba..e6e6085e 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<Long> useLib = version.getUseLib();
+        if (CollectionUtils.isNotEmpty(useLib)) {
+            List<Long> 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());
-- 
Gitee