From 1eb9c1f8e6aa74bca4bc28ad7c6873cc395426e0 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 6 Apr 2022 17:53:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E5=8F=AA=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=89=80=E5=B1=9E=E7=A9=BA=E9=97=B4=E7=9A=84=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1006218 --user=李玉号 项目添加成员只展示所属空间的成员列表
https://www.tapd.cn/55049933/s/1130533
---
 .../java/io/metersphere/controller/UserController.java    | 8 ++++++++
 .../src/business/components/project/menu/EditMember.vue   | 7 ++++++-
 .../src/business/components/settings/common/AddMember.vue | 8 +++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/UserController.java b/backend/src/main/java/io/metersphere/controller/UserController.java
index 7796b046e2..f0b5f355ef 100644
--- a/backend/src/main/java/io/metersphere/controller/UserController.java
+++ b/backend/src/main/java/io/metersphere/controller/UserController.java
@@ -158,12 +158,20 @@ public class UserController {
         return userService.getMemberList(request);
     }
 
+    @GetMapping("/ws/current/member/list")
+    public List<User> getCurrentWorkspaceMember() {
+        QueryMemberRequest request = new QueryMemberRequest();
+        request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        return userService.getMemberList(request);
+    }
+
     /**
      * 添加工作空间成员
      */
     @PostMapping("/ws/member/add")
     @MsAuditLog(module = OperLogModule.WORKSPACE_MEMBER, type = OperLogConstants.CREATE, title = "添加工作空间成员")
     public void addMember(@RequestBody AddMemberRequest request) {
+
         String wsId = request.getWorkspaceId();
 //        workspaceService.checkWorkspaceOwner(wsId);
         userService.addMember(request);
diff --git a/frontend/src/business/components/project/menu/EditMember.vue b/frontend/src/business/components/project/menu/EditMember.vue
index 546bc7cba4..895ceee2cc 100644
--- a/frontend/src/business/components/project/menu/EditMember.vue
+++ b/frontend/src/business/components/project/menu/EditMember.vue
@@ -1,5 +1,9 @@
 <template>
-  <add-member :group-type="GROUP_PROJECT" :group-scope-id="workspaceId" ref="addMember" @submit="submit"/>
+  <add-member :group-type="GROUP_PROJECT"
+              :group-scope-id="workspaceId"
+              ref="addMember"
+              @submit="submit"
+              :user-resource-url="userResourceUrl"/>
 </template>
 
 <script>
@@ -23,6 +27,7 @@ export default {
         ]
       },
       userList: [],
+      userResourceUrl: 'user/ws/current/member/list'
     };
   },
   computed: {
diff --git a/frontend/src/business/components/settings/common/AddMember.vue b/frontend/src/business/components/settings/common/AddMember.vue
index d5c8f2e699..a1f79b67c7 100644
--- a/frontend/src/business/components/settings/common/AddMember.vue
+++ b/frontend/src/business/components/settings/common/AddMember.vue
@@ -80,6 +80,12 @@ export default {
       default() {
         return '';
       }
+    },
+    userResourceUrl: {
+      type: String,
+      default() {
+        return '/user/list/';
+      }
     }
   },
   methods: {
@@ -96,7 +102,7 @@ export default {
     },
     open() {
       this.dialogVisible = true;
-      this.result = this.$get('/user/list/', response => {
+      this.result = this.$get(this.userResourceUrl, response => {
         this.userList = response.data;
         this.copyUserList = response.data;
       })