From 42e4c09e6212ea57079e0178ad1038d08d1fa51f Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Sat, 22 Jan 2022 14:53:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2):=20sq?=
 =?UTF-8?q?l=E6=9F=A5=E8=AF=A2=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 sql查询去掉多余代码
---
 .../base/mapper/ext/ExtApiDefinitionMapper.xml         |  2 +-
 .../metersphere/base/mapper/ext/ExtTestCaseMapper.xml  |  2 +-
 .../components/complete/EditCompleteDubboApi.vue       | 10 ----------
 .../components/complete/EditCompleteHTTPApi.vue        | 10 ----------
 .../components/complete/EditCompleteSQLApi.vue         | 10 ----------
 .../components/complete/EditCompleteTCPApi.vue         | 10 ----------
 6 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 0bca0d0317..d4af33d689 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -249,7 +249,7 @@
         project_version.name as version_name, api_definition.ref_id, user.name as user_name
         from api_definition
         left join user on api_definition.user_id = user.id
-        LEFT JOIN project_version ON project_version.id = api_definition.version_id AND project_version.project_id = #{request.projectId}
+        LEFT JOIN project_version ON project_version.id = api_definition.version_id
         <include refid="queryWhereCondition"/>
         <if test="request.orders != null and request.orders.size() > 0">
             order by
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 33b9215666..a79868fc38 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -230,7 +230,7 @@
             test_case.custom_fields, test_case.ref_id
         </if>
         from test_case
-        left join project_version on project_version.id = test_case.version_id and project_version.project_id = #{request.projectId}
+        left join project_version on project_version.id = test_case.version_id
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue
index 321175b531..0ce7bc9948 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue
@@ -243,16 +243,6 @@ export default {
         this.$get('/api/definition/get/' + response.data.id, res => {
           if (res.data) {
             this.newData = res.data;
-            this.$get('/api/definition/follow/' + response.data.id, resp => {
-              if(resp.data&&resp.data.follows){
-                for (let i = 0; i <resp.data.follows.length; i++) {
-                  if(resp.data.follows[i]===this.currentUser().id){
-                    this.newShowFollow = true;
-                    break;
-                  }
-                }
-              }
-            });
             this.dealWithTag(res.data);
             this.setRequest(res.data)
             if (!this.setRequest(res.data)) {
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index 0702918292..180c629d96 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -567,16 +567,6 @@ export default {
         this.$get('/api/definition/get/' + response.data.id, res => {
           if (res.data) {
             this.newData = res.data;
-            this.$get('/api/definition/follow/' + response.data.id, resp => {
-              if(resp.data&&resp.data.follows){
-                for (let i = 0; i <resp.data.follows.length; i++) {
-                  if(resp.data.follows[i]===this.currentUser().id){
-                    this.newShowFollow = true;
-                    break;
-                  }
-                }
-              }
-            });
             this.dealWithTag(res.data);
             this.setRequest(res.data)
             if (!this.setRequest(res.data)) {
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteSQLApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteSQLApi.vue
index 643e724618..e5ed4e383c 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteSQLApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteSQLApi.vue
@@ -247,16 +247,6 @@ export default {
         this.$get('/api/definition/get/' + response.data.id, res => {
           if (res.data) {
             this.newData = res.data;
-            this.$get('/api/definition/follow/' + response.data.id, resp => {
-              if(resp.data&&resp.data.follows){
-                for (let i = 0; i <resp.data.follows.length; i++) {
-                  if(resp.data.follows[i]===this.currentUser().id){
-                    this.newShowFollow = true;
-                    break;
-                  }
-                }
-              }
-            });
             this.dealWithTag(res.data);
             this.setRequest(res.data)
             if (!this.setRequest(res.data)) {
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue
index b962f9e1ed..5509743b5e 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue
@@ -371,16 +371,6 @@ export default {
             if (this.oldApiProtocol == null || this.oldApiProtocol === "") {
               this.oldApiProtocol = "TCP";
             }
-            this.$get('/api/definition/follow/' + response.data.id, resp => {
-              if(resp.data&&resp.data.follows){
-                for (let i = 0; i <resp.data.follows.length; i++) {
-                  if(resp.data.follows[i]===this.currentUser().id){
-                    this.newShowFollow = true;
-                    break;
-                  }
-                }
-              }
-            });
             this.dealWithTag(res.data);
             this.setRequest(res.data)
             if (!this.setRequest(res.data)) {