From 72006d16f06791b29348f1877be723b030476fa7 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 27 Oct 2020 23:45:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A7=E7=89=88=E6=9C=AC=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/service/TestCaseService.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 4113a6f23e..22903d2566 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -462,7 +462,15 @@ public class TestCaseService {
                 } else {
                     setp = steps;
                 }
-                JSONArray jsonArray = JSON.parseArray(setp);
+                JSONArray jsonArray = null;
+                try {
+                    jsonArray = JSON.parseArray(setp);
+                } catch (Exception e) {
+                    // 解决旧版本保存用例导出报错
+                    setp.replace("\"desc\":,", "\"desc\":\"\",");
+                    setp.replace("\"result\":}", "\"result\":\"\"}");
+                    LogUtil.error(e.getMessage(), e);
+                }
                 for (int j = 0; j < jsonArray.size(); j++) {
                     int num = j + 1;
                     step.append(num + "." + jsonArray.getJSONObject(j).getString("desc") + "\n");