From d3c02a4264a0799737ea6490f4b6b84d90b74acb Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Mon, 26 Feb 2024 10:47:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=84=9A=E6=9C=AC=E9=87=8D=E5=90=8D=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/parser/jmeter/processor/ScriptProcessorConverter.java   | 2 +-
 .../io/metersphere/project/service/CustomFunctionService.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 304127aef4..fafaf3a660 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
@@ -53,7 +53,7 @@ public abstract class ScriptProcessorConverter extends MsProcessorConverter<Scri
             scriptLanguage = scriptProcessor.getCommonScriptInfo().getScriptLanguage();
             script = scriptProcessor.getCommonScriptInfo().getScript();
         }
-        if (scriptLanguage == null) {
+        if (scriptLanguage == null || StringUtils.equalsIgnoreCase(scriptLanguage, ScriptLanguageType.BEANSHELL_JSR233.name())) {
             scriptLanguage = ScriptLanguageType.BEANSHELL.name();
         }
         testElement.setProperty(JmeterProperty.SCRIPT, script);
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/CustomFunctionService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/CustomFunctionService.java
index 745d319276..9f7c3baa1a 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/CustomFunctionService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/CustomFunctionService.java
@@ -147,6 +147,7 @@ public class CustomFunctionService {
     private void checkAddExist(CustomFunction customFunction) {
         CustomFunctionExample example = new CustomFunctionExample();
         example.createCriteria()
+                .andProjectIdEqualTo(customFunction.getProjectId())
                 .andNameEqualTo(customFunction.getName());
         if (customFunctionMapper.countByExample(example) > 0) {
             throw new MSException(ProjectResultCode.CUSTOM_FUNCTION_ALREADY_EXIST);
@@ -156,6 +157,7 @@ public class CustomFunctionService {
     private void checkUpdateExist(CustomFunction customFunction) {
         CustomFunctionExample example = new CustomFunctionExample();
         example.createCriteria()
+                .andProjectIdEqualTo(customFunction.getProjectId())
                 .andIdNotEqualTo(customFunction.getId())
                 .andNameEqualTo(customFunction.getName());
         if (customFunctionMapper.countByExample(example) > 0) {