From 041d3817dd18e747da6a3068be635a8a905c755e Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 12 Jul 2023 10:56:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DTCP=E6=8E=A5=E5=8F=A3=E8=A2=AB=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=EF=BC=8C=E4=BB=8D=E7=84=B6=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=AF=A5=E6=8E=A5=E5=8F=A3mock=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1027499 --user=王孝刚 【接口测试】github#25303，【接口测试】TCP
接口被删除，该TCP接口的MOCK还能被调用 https://www.tapd.cn/55049933/s/1391879
---
 .../request/assertions/MsAssertions.java        |  1 +
 .../mapper/ext/ExtMockExpectConfigMapper.xml    | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java
index ded2e53374..72228adfdb 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java
@@ -216,6 +216,7 @@ public class MsAssertions extends MsTestElement {
             assertion = new BeanShellAssertion();
             scriptLanguage = "beanshell";
             assertion.setProperty(TestElement.TEST_CLASS, BeanShellAssertion.class.getName());
+            assertion.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("BeanShellAssertionGui"));
             assertion.setProperty(BeanShellAssertion.SCRIPT, assertionJSR223.getScript());
         }
         assertion.setProperty("scriptLanguage", scriptLanguage);
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtMockExpectConfigMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtMockExpectConfigMapper.xml
index c456e75ab5..df5cb87369 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtMockExpectConfigMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtMockExpectConfigMapper.xml
@@ -3,8 +3,21 @@
 <mapper namespace="io.metersphere.base.mapper.ext.ExtMockExpectConfigMapper">
 
     <select id="selectByProjectIdAndStatusIsOpen" resultType="io.metersphere.base.domain.MockExpectConfigWithBLOBs">
-        SELECT * FROM mock_expect_config WHERE status = 'true' AND mock_config_id IN
-            (SELECT id FROM mock_config WHERE api_path IS NULL AND project_id = #{0} )
+        SELECT
+            m.*
+        FROM
+            mock_expect_config m
+        WHERE
+            m.STATUS = 'true'
+          AND m.mock_config_id IN (
+            SELECT
+                c.id
+            FROM
+                mock_config c
+                    INNER JOIN api_definition a ON a.id = c.api_id and a.project_id = c.project_id
+            WHERE
+                c.api_path IS NULL
+              AND c.project_id = #{0} and a.status !='Trash' and a.protocol='TCP')
     </select>
     <select id="selectByApiId" resultType="io.metersphere.base.domain.MockExpectConfigWithBLOBs">
         SELECT * FROM mock_expect_config WHERE mock_config_id IN