From 53dc397e510aba5f301228e57e56e41ce488c94d Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Tue, 28 Jun 2022 19:12:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --story=1008245 --user=李玉号 系统设置用户列表&添加成员优化 https://www.tapd.cn/55049933/s/1191441 --- .../io/metersphere/base/domain/UserGroup.java | 7 +- .../base/mapper/ext/ExtUserMapper.xml | 7 +- .../controller/UserController.java | 11 +- .../controller/request/UserRequest.java | 1 + .../io/metersphere/service/GroupService.java | 89 +++++++----- .../io/metersphere/service/UserService.java | 133 ++++++++++-------- .../components/settings/system/User.vue | 55 ++++++-- 7 files changed, 184 insertions(+), 119 deletions(-) diff --git a/backend/src/main/java/io/metersphere/base/domain/UserGroup.java b/backend/src/main/java/io/metersphere/base/domain/UserGroup.java index 72a004b9da..0ef3e5ecca 100644 --- a/backend/src/main/java/io/metersphere/base/domain/UserGroup.java +++ b/backend/src/main/java/io/metersphere/base/domain/UserGroup.java @@ -1,9 +1,14 @@ package io.metersphere.base.domain; -import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; @Data +@AllArgsConstructor +@NoArgsConstructor public class UserGroup implements Serializable { private String id; diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml index ffc4e27dcb..445ab5f0a7 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml @@ -52,7 +52,12 @@ AND u.email like CONCAT('%', #{userRequest.email},'%') - order by u.update_time desc + + ORDER BY + + ${order.name} ${order.type} + +