From 586bf457da058e1914599d8b528d6784e30b016e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 28 Feb 2020 17:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=BB=84=E7=BB=87=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E8=BF=9B=E5=85=A5=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/controller/UserController.java   |  8 ++++++++
 .../performance/components/settings/Member.vue   | 16 ++++++++++++++--
 2 files changed, 22 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 e4bec90aab..8ba5bbcd2d 100644
--- a/backend/src/main/java/io/metersphere/controller/UserController.java
+++ b/backend/src/main/java/io/metersphere/controller/UserController.java
@@ -140,6 +140,14 @@ public class UserController {
         return PageUtils.setPageInfo(page, userService.getOrgMemberList(request));
     }
 
+    /**
+     * 组织成员列表不分页
+     */
+    @PostMapping("/orgmember/list/all")
+    public List<User> getOrgMemberList(@RequestBody QueryOrgMemberRequest request) {
+        return userService.getOrgMemberList(request);
+    }
+
     /**
      * 查询组织成员列表 带角色信息
      */
diff --git a/frontend/src/performance/components/settings/Member.vue b/frontend/src/performance/components/settings/Member.vue
index 8022ad8317..16cdb25d16 100644
--- a/frontend/src/performance/components/settings/Member.vue
+++ b/frontend/src/performance/components/settings/Member.vue
@@ -245,8 +245,20 @@
       },
       create() {
         this.form = {};
-        this.$get('/user/list',response => {
-            this.createVisible = true;
+        let param = {
+          name: this.condition,
+          organizationId: this.currentUser().lastOrganizationId
+        };
+        let wsId = this.currentUser().lastWorkspaceId;
+        if (typeof wsId == "undefined" || wsId == null || wsId == "") {
+          this.$message({
+            message:'请先选择工作空间！',
+            type: 'warning'
+          });
+          return false;
+        }
+        this.$post('/user/orgmember/list/all', param,response => {
+          this.createVisible = true;
           this.$set(this.form, "userList", response.data);
         })
         this.result = this.$get('/role/list/test', response => {