From d2419e0f334aa27e576b9d4557c421b57f1c719f Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 12 Apr 2024 13:49:33 +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=8D=E4=B8=8D=E6=A0=A1=E9=AA=8C=E6=96=AD=E8=A8=80?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1039015 --user=王孝刚 【接口测试】场景-创建场景-添加响应体断言-匹配条件是不校验，执行结果错误
https://www.tapd.cn/55049933/s/1495788
---
 .../processor/assertion/VariableAssertionConverter.java     | 3 ++-
 .../project/api/assertion/body/MsJSONPathAssertionItem.java | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/VariableAssertionConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/VariableAssertionConverter.java
index 1233ec31d1..b4511d7cfd 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/VariableAssertionConverter.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/VariableAssertionConverter.java
@@ -64,7 +64,8 @@ public class VariableAssertionConverter extends AssertionConverter<MsVariableAss
     public boolean isValid(MsVariableAssertion.VariableAssertionItem variableAssertionItem) {
         return StringUtils.isNotBlank(variableAssertionItem.getVariableName())
                 && StringUtils.isNotBlank(variableAssertionItem.getCondition())
-                && BooleanUtils.isTrue(variableAssertionItem.getEnable());
+                && BooleanUtils.isTrue(variableAssertionItem.getEnable())
+                && !StringUtils.equals(variableAssertionItem.getCondition(), MsAssertionCondition.UNCHECK.name());
     }
 
     private static String parse2BeanshellJSR233Script(MsVariableAssertion.VariableAssertionItem variableAssertionItem) {
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsJSONPathAssertionItem.java b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsJSONPathAssertionItem.java
index 4090fbe170..8f4b560ffd 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsJSONPathAssertionItem.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/body/MsJSONPathAssertionItem.java
@@ -1,5 +1,6 @@
 package io.metersphere.project.api.assertion.body;
 
+import io.metersphere.sdk.constants.MsAssertionCondition;
 import io.metersphere.system.valid.EnumValue;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
@@ -31,7 +32,10 @@ public class MsJSONPathAssertionItem extends MsBodyAssertionItem {
     private String expectedValue;
 
     public boolean isValid() {
-        return StringUtils.isNotBlank(expression) && StringUtils.isNotBlank(condition) && BooleanUtils.isTrue(this.getEnable());
+        return StringUtils.isNotBlank(expression)
+                && StringUtils.isNotBlank(condition)
+                && BooleanUtils.isTrue(this.getEnable()
+                && !StringUtils.equals(condition, MsAssertionCondition.UNCHECK.name()));
     }
 }