From 4cfc697abba55a2f788d7cbc8024625f4f8697f6 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 21 Sep 2021 13:19:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20#1006703=20?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E3=80=81excel=E5=AF=BC=E5=85=A5=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=A0=87=E7=AD=BE=E8=A7=A3=E6=9E=90=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1006703 --user=宋天阳 【github#6196】恢复接口用例失败
https://www.tapd.cn/55049933/s/1048848
---
 .../io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml   | 2 +-
 .../excel/listener/TestCaseNoModelDataListener.java           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 8ae5581585..3ee13e2991 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -586,7 +586,7 @@
         update api_test_case
         set original_status=status,
         status = 'Trash',delete_time = #{deleteTime},delete_user_id = #{deleteUserId}
-        where id IN
+        where status != 'Trash' AND id IN
         <foreach collection="ids" item="v" separator="," open="(" close=")">
             #{v}
         </foreach>
diff --git a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
index 504eaa80ac..a85c6e7ec9 100644
--- a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
+++ b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
@@ -486,8 +486,8 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
         String tags = data.getTags();
         try {
             if (StringUtils.isNotBlank(tags)) {
-                JSONArray.parse(tags);
-                return tags;
+                JSONArray array = JSONArray.parseArray(tags);
+                return array.toJSONString();
             }
             return "[]";
         } catch (Exception e) {