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 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 => {