From c1b6e40d6b77ba0b6fc1e7ee24ed8bdab64cf2bc Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 27 May 2021 18:40:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiTestEnvironmentController.java         |  8 ++--
 .../controller/UserController.java            |  9 +++-
 .../io/metersphere/service/UserService.java   | 44 +++++++++++++++++++
 .../automation/scenario/AddBasisScenario.vue  |  4 +-
 .../automation/scenario/ApiScenarioList.vue   |  4 +-
 .../automation/scenario/EditApiScenario.vue   |  4 +-
 .../automation/scenario/api/AddBasisApi.vue   |  2 +-
 .../scenario/api/RelevanceApiList.vue         |  3 +-
 .../api/definition/components/ApiConfig.vue   |  4 +-
 .../components/basis/AddBasisApi.vue          |  4 +-
 .../components/complete/BasisApi.vue          |  3 +-
 .../complete/EditCompleteHTTPApi.vue          |  3 +-
 .../components/complete/TCPBasicApi.vue       |  3 +-
 .../definition/components/list/ApiList.vue    |  4 +-
 .../performance/test/PerformanceTestList.vue  |  2 +-
 .../settings/project/ProjectList.vue          |  2 +-
 .../settings/workspace/MsProject.vue          |  2 +-
 .../template/CustomFiledComponent.vue         |  4 +-
 .../track/case/components/TestCaseCreate.vue  |  4 +-
 .../track/case/components/TestCaseEdit.vue    |  3 +-
 .../track/case/components/TestCaseList.vue    |  3 +-
 .../track/plan/components/TestPlanEdit.vue    |  4 +-
 .../plan/view/comonents/ExecutorEdit.vue      |  3 +-
 .../comonents/api/TestPlanApiCaseList.vue     |  4 +-
 .../functional/FunctionalTestCaseList.vue     |  4 +-
 .../review/components/TestCaseReviewEdit.vue  |  4 +-
 frontend/src/business/components/xpack        |  2 +-
 27 files changed, 98 insertions(+), 42 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java
index 998b43078d..e7e45a28e0 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java
@@ -49,10 +49,10 @@ public class ApiTestEnvironmentController {
      */
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<ApiTestEnvironmentWithBLOBs>> listByCondition(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody EnvironmentRequest environmentRequest) {
-        List<String> projectIds = environmentRequest.getProjectIds();
-        for (String projectId : projectIds) {
-            checkPermissionService.checkProjectOwner(projectId);
-        }
+//        List<String> projectIds = environmentRequest.getProjectIds();
+//        for (String projectId : projectIds) {
+//            checkPermissionService.checkProjectOwner(projectId);
+//        }
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, apiTestEnvironmentService.listByConditions(environmentRequest));
     }
diff --git a/backend/src/main/java/io/metersphere/controller/UserController.java b/backend/src/main/java/io/metersphere/controller/UserController.java
index 3a7c24bd7d..0727925cc5 100644
--- a/backend/src/main/java/io/metersphere/controller/UserController.java
+++ b/backend/src/main/java/io/metersphere/controller/UserController.java
@@ -278,11 +278,11 @@ public class UserController {
     }
 
     /**
-     * 组织成员列表不分页
+     * 组织下所有相关人员
      */
     @PostMapping("/org/member/list/all")
     public List<User> getOrgMemberList(@RequestBody QueryOrgMemberRequest request) {
-        return userService.getOrgMemberList(request);
+        return userService.getOrgAllMember(request);
     }
 
     @GetMapping("/besideorg/list/{orgId}")
@@ -314,6 +314,11 @@ public class UserController {
         return userService.getTestManagerAndTestUserList(request);
     }
 
+    @PostMapping("/project/member/tester/list")
+    public List<User> getProjectMember(@RequestBody QueryMemberRequest request) {
+        return userService.getProjectMember(request);
+    }
+
     @GetMapping("/search/{condition}")
     public List<User> searchUser(@PathVariable String condition) {
         return userService.searchUser(condition);
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index 294055eb60..5f20235ab6 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -1307,4 +1307,48 @@ public class UserService {
 
         userGroupMapper.deleteByExample(userGroupExample);
     }
+
+    public List<User> getProjectMember(QueryMemberRequest request) {
+        String projectId = request.getProjectId();
+        if (StringUtils.isBlank(projectId)) {
+            return new ArrayList<>();
+        }
+        return extUserGroupMapper.getProjectMemberList(request);
+    }
+
+    public List<User> getOrgAllMember(QueryOrgMemberRequest request) {
+        String orgId = request.getOrganizationId();
+        if (StringUtils.isBlank(orgId)) {
+            return new ArrayList<>();
+        }
+        List<String> sourceIds = new ArrayList<>();
+        sourceIds.add(orgId);
+
+        WorkspaceExample workspaceExample = new WorkspaceExample();
+        workspaceExample.createCriteria().andOrganizationIdEqualTo(orgId);
+        List<Workspace> workspaces = workspaceMapper.selectByExample(workspaceExample);
+        if (CollectionUtils.isNotEmpty(workspaces)) {
+            List<String> wsIds = workspaces.stream().map(Workspace::getId).collect(Collectors.toList());
+            sourceIds.addAll(wsIds);
+            ProjectExample projectExample = new ProjectExample();
+            projectExample.createCriteria().andWorkspaceIdIn(wsIds);
+            List<Project> projectList = projectMapper.selectByExample(projectExample);
+            if (CollectionUtils.isNotEmpty(projectList)) {
+                List<String> proIds = projectList.stream().map(Project::getId).collect(Collectors.toList());
+                sourceIds.addAll(proIds);
+            }
+        }
+
+        UserGroupExample userGroupExample = new UserGroupExample();
+        userGroupExample.createCriteria().andSourceIdIn(sourceIds);
+        List<UserGroup> userGroups = userGroupMapper.selectByExample(userGroupExample);
+        List<String> userIds = userGroups.stream().map(UserGroup::getUserId).distinct().collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(userIds)) {
+            return new ArrayList<>();
+        }
+
+        UserExample userExample = new UserExample();
+        userExample.createCriteria().andIdIn(userIds);
+        return userMapper.selectByExample(userExample);
+    }
 }
diff --git a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
index dcb33e50db..764576df17 100644
--- a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
@@ -58,7 +58,7 @@
 
 <script>
   import {WORKSPACE_ID} from '@/common/js/constants';
-  import {getCurrentUser, getUUID} from "@/common/js/utils";
+  import {getCurrentProjectID, getCurrentUser, getUUID} from "@/common/js/utils";
   import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
   import {saveScenario} from "@/business/components/api/automation/api-automation";
 
@@ -126,7 +126,7 @@
       },
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
           this.userOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 85361e64d5..e0936faa94 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -188,7 +188,7 @@ import MsTableHeader from "@/business/components/common/components/MsTableHeader
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
 import MsTag from "../../../common/components/MsTag";
-import {downloadFile, getUUID, strMapToObj} from "@/common/js/utils";
+import {downloadFile, getCurrentProjectID, getUUID, strMapToObj} from "@/common/js/utils";
 import MsApiReportDetail from "../report/ApiReportDetail";
 import MsTableMoreBtn from "./TableMoreBtn";
 import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
@@ -588,7 +588,7 @@ export default {
     },
     getPrincipalOptions(option) {
       let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         option.push(...response.data);
         this.userFilters = response.data.map(u => {
           return {text: u.name, value: u.id};
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 2aa51f5322..3a0fe7b793 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -253,7 +253,7 @@
   import {parseEnvironment} from "../../definition/model/EnvironmentModel";
   import {ELEMENT_TYPE, ELEMENTS} from "./Setting";
   import MsApiCustomize from "./ApiCustomize";
-  import {getUUID, objToStrMap, strMapToObj, handleCtrlSEvent} from "@/common/js/utils";
+  import {getUUID, objToStrMap, strMapToObj, handleCtrlSEvent, getCurrentProjectID} from "@/common/js/utils";
   import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
   import MsInputTag from "./MsInputTag";
   import MsRun from "./DebugRun";
@@ -784,7 +784,7 @@
       },
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()},response => {
           this.maintainerOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue
index 09349bb9e6..893acfc094 100644
--- a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue
@@ -240,7 +240,7 @@
       },
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()},response => {
           this.maintainerOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
index 4a73f9c73e..7fb75a7824 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
@@ -171,6 +171,7 @@
   import TableSelectCountBar from "./TableSelectCountBar";
   import {_filter, _handleSelect, _handleSelectAll, _sort, buildBatchParam, getLabel,} from "@/common/js/tableUtils";
   import {API_LIST, WORKSPACE_ID} from "@/common/js/constants";
+  import {getCurrentProjectID} from "@/common/js/utils";
 
   export default {
     name: "RelevanceApiList",
@@ -406,7 +407,7 @@
       },
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()},response => {
           this.valueArr.userId = response.data;
           this.userFilters = response.data.map(u => {
             return {text: u.name, value: u.id};
diff --git a/frontend/src/business/components/api/definition/components/ApiConfig.vue b/frontend/src/business/components/api/definition/components/ApiConfig.vue
index ab002f3e3d..5476b691f5 100644
--- a/frontend/src/business/components/api/definition/components/ApiConfig.vue
+++ b/frontend/src/business/components/api/definition/components/ApiConfig.vue
@@ -32,7 +32,7 @@
   import MsEditCompleteSqlApi from "./complete/EditCompleteSQLApi";
 
   import {Body} from "../model/ApiTestModel";
-  import {getUUID} from "@/common/js/utils";
+  import {getCurrentProjectID, getUUID} from "@/common/js/utils";
   import {createComponent, Request} from "./jmeter/components";
   import Sampler from "./jmeter/components/sampler/sampler";
   import {WORKSPACE_ID} from '@/common/js/constants';
@@ -117,7 +117,7 @@
       },
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
           this.maintainerOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
index 055a927db7..d5139630fe 100644
--- a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
+++ b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
@@ -59,7 +59,7 @@
   import MsDialogFooter from "../../../../common/components/MsDialogFooter";
   import {WORKSPACE_ID} from '../../../../../../common/js/constants';
   import {REQ_METHOD} from "../../model/JsonData";
-  import {getCurrentUser} from "../../../../../../common/js/utils";
+  import {getCurrentProjectID, getCurrentUser} from "../../../../../../common/js/utils";
   import {createComponent, Request} from "../jmeter/components";
 
   export default {
@@ -179,7 +179,7 @@
       },
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
           this.maintainerOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/api/definition/components/complete/BasisApi.vue b/frontend/src/business/components/api/definition/components/complete/BasisApi.vue
index dece21bd2b..48a6eb031f 100644
--- a/frontend/src/business/components/api/definition/components/complete/BasisApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/BasisApi.vue
@@ -64,6 +64,7 @@
   import {WORKSPACE_ID} from '../../../../../../common/js/constants';
   import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
   import MsSelectTree from "../../../../common/select-tree/SelectTree";
+  import {getCurrentProjectID} from "@/common/js/utils";
 
   export default {
     name: "MsBasisApi",
@@ -107,7 +108,7 @@
     methods: {
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()},response => {
           this.maintainerOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index eabbf6cc09..ccf6981d12 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -128,6 +128,7 @@
   import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
   import MsSelectTree from "../../../../common/select-tree/SelectTree";
   import MsChangeHistory from "../../../../history/ChangeHistory";
+  import {getCurrentProjectID} from "@/common/js/utils";
 
   export default {
     name: "MsAddCompleteHttpApi",
@@ -246,7 +247,7 @@
       },
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
           this.maintainerOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/api/definition/components/complete/TCPBasicApi.vue b/frontend/src/business/components/api/definition/components/complete/TCPBasicApi.vue
index 704c505e9b..b6c385dff3 100644
--- a/frontend/src/business/components/api/definition/components/complete/TCPBasicApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/TCPBasicApi.vue
@@ -85,6 +85,7 @@
   import {WORKSPACE_ID} from '../../../../../../common/js/constants';
   import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
   import MsSelectTree from "../../../../common/select-tree/SelectTree";
+  import {getCurrentProjectID} from "@/common/js/utils";
 
   export default {
     name: "MsTcpBasicApi",
@@ -133,7 +134,7 @@
     methods: {
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
           this.maintainerOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 63dd6c5e1a..a2790b7c2f 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -182,7 +182,7 @@ import MsBottomContainer from "../BottomContainer";
 import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
 import MsBatchEdit from "../basis/BatchEdit";
 import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
-import {downloadFile} from "@/common/js/utils";
+import {downloadFile, getCurrentProjectID} from "@/common/js/utils";
 import {API_LIST, PROJECT_NAME, WORKSPACE_ID} from '@/common/js/constants';
 import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
 import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
@@ -557,7 +557,7 @@ export default {
     },
     getMaintainerOptions() {
       let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.valueArr.userId = response.data;
         this.userFilters = response.data.map(u => {
           return {text: u.name, value: u.id};
diff --git a/frontend/src/business/components/performance/test/PerformanceTestList.vue b/frontend/src/business/components/performance/test/PerformanceTestList.vue
index 3f31e0ed90..c84c898274 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestList.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestList.vue
@@ -172,7 +172,7 @@ export default {
   methods: {
     getMaintainerOptions() {
       let workspaceId = getCurrentWorkspaceId();
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.userFilters = response.data.map(u => {
           return {text: u.name, value: u.id};
         });
diff --git a/frontend/src/business/components/settings/project/ProjectList.vue b/frontend/src/business/components/settings/project/ProjectList.vue
index 7ac82f8acb..863efbe19d 100644
--- a/frontend/src/business/components/settings/project/ProjectList.vue
+++ b/frontend/src/business/components/settings/project/ProjectList.vue
@@ -237,7 +237,7 @@ export default {
   methods: {
     getMaintainerOptions() {
       let workspaceId = getCurrentWorkspaceId();
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.userFilters = response.data.map(u => {
           return {text: u.name, value: u.id};
         });
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 5bf59ead50..2c0a220cc5 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -365,7 +365,7 @@ export default {
   methods: {
     getMaintainerOptions() {
       let workspaceId = getCurrentWorkspaceId();
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.userFilters = response.data.map(u => {
           return {text: u.name, value: u.id};
         });
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
index 5a6c900475..c24a507521 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
@@ -90,7 +90,7 @@
 
 <script>
 import MsTableColumn from "@/business/components/common/components/table/Ms-table-column";
-import {getCurrentWorkspaceId} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentWorkspaceId} from "@/common/js/utils";
 export default {
   name: "CustomFiledComponent",
   components: {MsTableColumn},
@@ -107,7 +107,7 @@ export default {
   },
   mounted() {
     if (this.data.type === 'member' || this.data.type === 'multipleMember') {
-      this.$post('/user/ws/member/tester/list', {workspaceId: getCurrentWorkspaceId()}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.memberOptions = response.data;
       });
     }
diff --git a/frontend/src/business/components/track/case/components/TestCaseCreate.vue b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
index 6177a35ca1..217c00f29c 100644
--- a/frontend/src/business/components/track/case/components/TestCaseCreate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import {getCurrentUser} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
 import {WORKSPACE_ID} from "@/common/js/constants";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
 import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
@@ -152,7 +152,7 @@ export default {
 
     getMaintainerOptions() {
       let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.userOptions = response.data;
       });
     },
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index d8707d7fcf..6783c90ff2 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -122,6 +122,7 @@
   import {TokenKey, WORKSPACE_ID} from '@/common/js/constants';
   import MsDialogFooter from '../../../common/components/MsDialogFooter'
   import {
+    getCurrentProjectID,
     getCurrentUser,
     getNodePath,
     handleCtrlSEvent, hasPermission,
@@ -700,7 +701,7 @@
       },
       getMaintainerOptions() {
         let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()},response => {
           this.maintainerOptions = response.data;
         });
       },
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 046b0ef03b..56d9ceec58 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -199,6 +199,7 @@ import {Track_Test_Case} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 import PlanStatusTableItem from "@/business/components/track/common/tableItems/plan/PlanStatusTableItem";
+import {getCurrentProjectID} from "@/common/js/utils";
 
 export default {
   name: "TestCaseList",
@@ -648,7 +649,7 @@ export default {
     },
     getMaintainerOptions() {
       let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.valueArr.maintainer = 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 55ad3bc0f8..3c34282edb 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -125,7 +125,7 @@
 
 import {WORKSPACE_ID} from '@/common/js/constants';
 import TestPlanStatusButton from "../common/TestPlanStatusButton";
-import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentProjectID, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
 
 export default {
@@ -249,7 +249,7 @@ export default {
     },
     setPrincipalOptions() {
       let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()},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 29b8237af6..75f84378fc 100644
--- a/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue
@@ -20,6 +20,7 @@
 <script>
     import {WORKSPACE_ID} from '../../../../../../common/js/constants'
     import MsDialogFooter from '../../../../common/components/MsDialogFooter'
+    import {getCurrentProjectID} from "@/common/js/utils";
 
     export default {
       name: "executorEdit",
@@ -39,7 +40,7 @@
       methods: {
         setMaintainerOptions() {
           let workspaceId = localStorage.getItem(WORKSPACE_ID);
-          this.$post('/user/ws/member/tester/list', {workspaceId:workspaceId}, response => {
+          this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
             this.executorOptions = response.data;
           });
         },
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index 04aa7abb55..6c82f19a53 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -168,7 +168,7 @@ import MsBottomContainer from "../../../../../api/definition/components/BottomCo
 import ShowMoreBtn from "../../../../case/components/ShowMoreBtn";
 import BatchEdit from "@/business/components/track/case/components/BatchEdit";
 import {API_METHOD_COLOUR, CASE_PRIORITY, RESULT_MAP} from "../../../../../api/definition/model/JsonData";
-import {strMapToObj} from "@/common/js/utils";
+import {getCurrentProjectID, strMapToObj} from "@/common/js/utils";
 import ApiListContainer from "../../../../../api/definition/components/list/ApiListContainer";
 import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
 import {getBodyUploadFiles, getUUID} from "../../../../../../../common/js/utils";
@@ -342,7 +342,7 @@ export default {
     },
     getMaintainerOptions() {
       let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.valueArr.userId = response.data;
         this.userFilters = response.data.map(u => {
           return {text: u.name, value: u.id};
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index ee0c601d9b..78936961bf 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -266,7 +266,7 @@ import {
   TokenKey,
   WORKSPACE_ID
 } from "@/common/js/constants";
-import {hasPermission} from "@/common/js/utils";
+import {getCurrentProjectID, hasPermission} from "@/common/js/utils";
 import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
 import StatusTableItem from "../../../../common/tableItems/planview/StatusTableItem";
 import TypeTableItem from "../../../../common/tableItems/planview/TypeTableItem";
@@ -682,7 +682,7 @@ export default {
     },
     getMaintainerOptions() {
       let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
         this.valueArr.executor = response.data;
         this.executorFilters = response.data.map(u => {
           return {text: u.name, value: u.id};
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
index 2421937e63..ccf0431682 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
@@ -102,7 +102,7 @@
 
 import TestPlanStatusButton from "../../plan/common/TestPlanStatusButton";
 import {WORKSPACE_ID} from "@/common/js/constants";
-import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentProjectID, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
 
 export default {
@@ -233,7 +233,7 @@ export default {
     },
     setReviewerOptions() {
       let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.result = this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+      this.result = this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()},response => {
         this.reviewerOptions = response.data;
       });
     },
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 0af67efb33..526400764f 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 0af67efb336b3f5f6718c7b2684de4d4985c0aee
+Subproject commit 526400764fc45b12dd81f5b89137f8bc5a012f4d