From c7c8734cedf6afe2013735844ed44b7f7b609922 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Fri, 29 Mar 2024 16:52:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=9A=84=E5=85=AC=E5=85=B1=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=AF=A6=E6=83=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jmeter/processor/ScriptProcessorConverter.java       | 4 ++++
 .../io/metersphere/api/service/ApiCommonService.java     | 9 +++++++++
 .../io/metersphere/project/dto/CommonScriptInfo.java     | 4 ++++
 3 files changed, 17 insertions(+)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/ScriptProcessorConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/ScriptProcessorConverter.java
index 293da3e862..ab3a236e6a 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/ScriptProcessorConverter.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/ScriptProcessorConverter.java
@@ -57,6 +57,10 @@ public abstract class ScriptProcessorConverter extends MsProcessorConverter<Scri
         String scriptLanguage = scriptProcessor.getScriptLanguage();
         String script = scriptProcessor.getScript();
         if (scriptProcessor.isEnableCommonScript()) {
+            if (BooleanUtils.isTrue(scriptProcessor.getCommonScriptInfo().getDeleted())) {
+                // 如果公共脚本被删除则不处理
+                return;
+            }
             scriptLanguage = scriptProcessor.getCommonScriptInfo().getScriptLanguage();
             script = scriptProcessor.getCommonScriptInfo().getScript();
         }
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiCommonService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiCommonService.java
index 61516224e9..57202b657a 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiCommonService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiCommonService.java
@@ -208,8 +208,17 @@ public class ApiCommonService {
         for (ScriptProcessor processor : scriptsProcessors) {
             CommonScriptInfo commonScriptInfo = processor.getCommonScriptInfo();
             CustomFunctionBlob customFunctionBlob = customFunctionBlobMap.get(commonScriptInfo.getId());
+
             CustomFunction customFunction = customFunctionMap.get(commonScriptInfo.getId());
 
+            if (customFunction == null || customFunctionBlob == null) {
+                if (customFunction == null) {
+                    // 公共脚本被删除，就改成非公共脚本
+                    processor.getCommonScriptInfo().setDeleted(true);
+                }
+                continue;
+            }
+
             // 设置公共脚本信息
             Optional.ofNullable(customFunctionBlob.getParams()).ifPresent(paramsBlob -> {
                 List<KeyValueParam> commonParams = JSON.parseArray(new String(paramsBlob), KeyValueParam.class);
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/dto/CommonScriptInfo.java b/backend/services/project-management/src/main/java/io/metersphere/project/dto/CommonScriptInfo.java
index 68166e0ff1..376f9a5f68 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/dto/CommonScriptInfo.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/dto/CommonScriptInfo.java
@@ -18,6 +18,10 @@ public class CommonScriptInfo {
      */
     @Size(min = 1, max = 50)
     private String id;
+    /**
+     * 脚本是否删除
+     */
+    private Boolean deleted = false;
     /**
      * 公共脚本的名字
      * 页面展示需要