From e05341c4e018502ef86c746ba4e922df75d7935d Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 7 Mar 2024 20:09:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E7=8E=AF=E5=A2=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/mapper/ExtApiDebugModuleMapper.xml           |  2 +-
 .../api/mapper/ExtApiDefinitionModuleMapper.xml      |  2 +-
 .../project/api/assertion/MsAssertion.java           |  4 ++++
 .../project/dto/environment/EnvironmentRequest.java  |  2 --
 .../project/mapper/ExtEnvironmentMapper.xml          |  4 ++--
 .../project/service/EnvironmentService.java          |  1 +
 .../views/project-management/environmental/index.vue | 12 ++++++------
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugModuleMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugModuleMapper.xml
index c456ba8dcb..36e3922aae 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugModuleMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugModuleMapper.xml
@@ -54,7 +54,7 @@
         FROM api_debug
         WHERE create_user = #{userId}
 
-        ORDER BY pos ASC
+        ORDER BY pos DESC
     </select>
     <select id="countModuleIdByKeywordAndProtocol" resultType="io.metersphere.project.dto.ModuleCountDTO">
         SELECT f.module_id AS moduleId, count(f.id) AS dataCount
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionModuleMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionModuleMapper.xml
index 4a1b8c8efc..7c08ce38d4 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionModuleMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionModuleMapper.xml
@@ -46,7 +46,7 @@
         FROM api_definition
         where api_definition.deleted = #{deleted}
         <include refid="queryWhereCondition"/>
-        ORDER BY pos ASC
+        ORDER BY pos DESC
     </select>
     <select id="countModuleIdByRequest" resultType="io.metersphere.project.dto.ModuleCountDTO">
         SELECT module_id AS moduleId, count(id) AS dataCount
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/MsAssertion.java b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/MsAssertion.java
index 210b5d7650..4105df8d9d 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/MsAssertion.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/api/assertion/MsAssertion.java
@@ -39,4 +39,8 @@ public abstract class MsAssertion {
      */
     @Size(max = 100)
     private String name;
+    /**
+     * id
+     */
+    private String id;
 }
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/dto/environment/EnvironmentRequest.java b/backend/services/project-management/src/main/java/io/metersphere/project/dto/environment/EnvironmentRequest.java
index c80c663abb..72d28298ea 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/dto/environment/EnvironmentRequest.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/dto/environment/EnvironmentRequest.java
@@ -27,8 +27,6 @@ public class EnvironmentRequest implements Serializable {
     private String name;
     @Schema(description = "环境配置")
     private EnvironmentConfig config;
-    @Schema(description = "是否是mock环境")
-    private Boolean mock;
     @Schema(description = "描述")
     private String description;
 
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtEnvironmentMapper.xml b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtEnvironmentMapper.xml
index 06395e3d97..472e7b093f 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtEnvironmentMapper.xml
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtEnvironmentMapper.xml
@@ -19,7 +19,7 @@
             )
 
         </if>
-            ORDER BY pos asc
+            ORDER BY pos DESC
     </select>
     <select id="groupList" resultType="io.metersphere.sdk.domain.EnvironmentGroup">
         SELECT
@@ -33,7 +33,7 @@
             )
 
         </if>
-        ORDER BY pos asc
+        ORDER BY pos DESC
     </select>
     <select id="getPos" resultType="java.lang.Long">
         SELECT pos
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/EnvironmentService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/EnvironmentService.java
index 74b924780f..ede87bf5b6 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/EnvironmentService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/EnvironmentService.java
@@ -307,6 +307,7 @@ public class EnvironmentService {
         environment.setUpdateUser(userId);
         environment.setProjectId(request.getProjectId());
         environment.setName(request.getName());
+        environment.setDescription(request.getDescription());
         checkEnvironmentExist(environment);
         environment.setUpdateTime(System.currentTimeMillis());
         environmentMapper.updateByPrimaryKeySelective(environment);
diff --git a/frontend/src/views/project-management/environmental/index.vue b/frontend/src/views/project-management/environmental/index.vue
index 7662a5ef14..4c9a0da4cd 100644
--- a/frontend/src/views/project-management/environmental/index.vue
+++ b/frontend/src/views/project-management/environmental/index.vue
@@ -419,26 +419,26 @@
 
       const params = {
         projectId: appStore.currentProjectId,
-        targetId: type === EnvAuthTypeEnum.ENVIRONMENT ? envList.value[_newIndex].id : evnGroupList.value[_newIndex].id,
-        moveId: '',
+        moveId: type === EnvAuthTypeEnum.ENVIRONMENT ? envList.value[_newIndex].id : evnGroupList.value[_newIndex].id,
+        targetId: '',
         moveMode: 'AFTER',
       };
       if (type === EnvAuthTypeEnum.ENVIRONMENT) {
         if (envList.value[_newIndex + 1].id) {
           params.moveMode = 'BEFORE';
-          params.moveId = envList.value[_newIndex + 1].id;
+          params.targetId = envList.value[_newIndex + 1].id;
         } else if (envList.value[_newIndex - 1].id && !envList.value[_newIndex + 1].id) {
           params.moveMode = 'AFTER';
-          params.moveId = envList.value[_newIndex - 1].id;
+          params.targetId = envList.value[_newIndex - 1].id;
         }
       }
       if (type === EnvAuthTypeEnum.ENVIRONMENT_GROUP) {
         if (evnGroupList.value[_newIndex + 1].id) {
           params.moveMode = 'AFTER';
-          params.moveId = evnGroupList.value[_newIndex + 1].id;
+          params.targetId = evnGroupList.value[_newIndex + 1].id;
         } else if (evnGroupList.value[_newIndex - 1].id && !evnGroupList.value[_newIndex + 1].id) {
           params.moveMode = 'BEFORE';
-          params.moveId = evnGroupList.value[_newIndex - 1].id;
+          params.targetId = evnGroupList.value[_newIndex - 1].id;
         }
       }