From 4e7d5d2b9e1ced930858b42e5e95b3143654e945 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 2 Sep 2021 14:12:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20--bug=3D1005183=20--user=3D=E9=99=88?=
 =?UTF-8?q?=E5=BB=BA=E6=98=9F=20=E3=80=90=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95-=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E3=80=91?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8E=A5=E5=8F=A3=E6=97=B6=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=AD=A4=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8E=E6=AD=A4=E5=AD=97=E6=AE=B5=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=20{#=5Forginal=5F?=
 =?UTF-8?q?url#}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/definition/parse/MsDefinitionParser.java          | 4 ++++
 .../components/api/definition/components/list/ApiList.vue     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
index d27bf76a8a..6365b63fb6 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
@@ -12,6 +12,7 @@ import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
 import io.metersphere.base.domain.ApiModule;
 import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
 import io.metersphere.commons.constants.ApiImportPlatform;
+import io.metersphere.commons.utils.SessionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -124,6 +125,9 @@ public class MsDefinitionParser extends MsAbstractParser<ApiDefinitionImport> {
         JSONObject requestObj = JSONObject.parseObject(request);
         requestObj.put("id", id);
         apiDefinition.setRequest(JSONObject.toJSONString(requestObj));
+        apiDefinition.setCreateUser(SessionUtils.getUserId());
+        apiDefinition.setUserId(SessionUtils.getUserId());
+        apiDefinition.setDeleteUserId(null);
         parseCase(caseMap, apiDefinition, importRequest, originId);
     }
 
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index a53169e321..c0df4b7eca 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -118,6 +118,7 @@
             <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain"
                     :show-tooltip="true" :content="itemName"
                     style="margin-left: 0px; margin-right: 2px"/>
+            <span/>
           </template>
         </ms-table-column>