diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java index 4bc8eb87cc..f504f373c0 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java @@ -27,4 +27,5 @@ public interface ExtUserRoleMapper { List getBesideOrgMemberList(@Param("orgId") String orgId); + List getTestManagerAndTestUserList(@Param("request") QueryMemberRequest request); } diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml index 5b15cd3e29..f45f2d2d17 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml @@ -89,7 +89,12 @@ join role r on r.id = ur.role_id where w.id = #{workspaceId} and ur.user_id = #{userId} - - - + \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/controller/UserController.java b/backend/src/main/java/io/metersphere/controller/UserController.java index 0deb7b9ba6..d674014dbd 100644 --- a/backend/src/main/java/io/metersphere/controller/UserController.java +++ b/backend/src/main/java/io/metersphere/controller/UserController.java @@ -274,4 +274,14 @@ public class UserController { return userService.updateUserPassword(request); } + /** + * 获取工作空间成员用户 不分页 + */ + @PostMapping("/ws/member/tester/list") + @RequiresRoles(value = {RoleConstants.ORG_ADMIN, RoleConstants.TEST_MANAGER, + RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR) + public List getTestManagerAndTestUserList(@RequestBody QueryMemberRequest request) { + return userService.getTestManagerAndTestUserList(request); + } + } diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java index 1028f851f0..934b4bbe2a 100644 --- a/backend/src/main/java/io/metersphere/service/UserService.java +++ b/backend/src/main/java/io/metersphere/service/UserService.java @@ -457,4 +457,7 @@ public class UserService { return extUserMapper.getDefaultLanguage(key); } + public List getTestManagerAndTestUserList(QueryMemberRequest request) { + return extUserRoleMapper.getTestManagerAndTestUserList(request); + } } diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index bda46a0224..b2c5d97e64 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -409,7 +409,7 @@ }, getMaintainerOptions() { let workspaceId = localStorage.getItem(WORKSPACE_ID); - this.$post('/user/ws/member/list/all', {workspaceId:workspaceId}, response => { + this.$post('/user/ws/member/tester/list', {workspaceId:workspaceId}, response => { this.maintainerOptions = response.data; }); }, diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue index e1aabec4cb..bbf7f22aa9 100644 --- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue +++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue @@ -188,7 +188,7 @@ }, setPrincipalOptions() { let workspaceId = localStorage.getItem(WORKSPACE_ID); - this.$post('/user/ws/member/list/all', {workspaceId:workspaceId}, response => { + this.$post('/user/ws/member/tester/list', {workspaceId:workspaceId}, response => { this.principalOptions = response.data; }); }, diff --git a/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue b/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue index 41d952ca90..29b8237af6 100644 --- a/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue +++ b/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue @@ -39,7 +39,7 @@ methods: { setMaintainerOptions() { let workspaceId = localStorage.getItem(WORKSPACE_ID); - this.$post('/user/ws/member/list/all', {workspaceId:workspaceId}, response => { + this.$post('/user/ws/member/tester/list', {workspaceId:workspaceId}, response => { this.executorOptions = response.data; }); },