fix(功能用例、接口测试): #1006703 回复接口用例失败、excel导入测试用例标签解析错误

--bug=1006703 --user=宋天阳 【github#6196】恢复接口用例失败
https://www.tapd.cn/55049933/s/1048848

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>

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);
+                JSONArray array = JSONArray.parseArray(tags);
-                return tags;
+                return array.toJSONString();
             }
             return "[]";
         } catch (Exception e) {