[Feature][API] Tenant management list is isolated by cluster (#337)

datavane · Jul 12, 2023 · 1606494 · 1606494
1 parent 289af53
commit 1606494
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/datasophon-api/src/main/java/com/datasophon/api/service/impl/ClusterUserServiceImpl.java b/datasophon-api/src/main/java/com/datasophon/api/service/impl/ClusterUserServiceImpl.java
@@ -151,6 +151,7 @@ private boolean hasRepeatUserName(Integer clusterId, String username) {
     public Result listPage(Integer clusterId, String username, Integer page, Integer pageSize) {
         Integer offset = (page - 1) * pageSize;
         List<ClusterUser> list = this.list(new QueryWrapper<ClusterUser>().like(Constants.USERNAME, username)
+                .eq(Constants.CLUSTER_ID, clusterId)
                 .last("limit " + offset + "," + pageSize));
         for (ClusterUser clusterUser : list) {
             ClusterGroup mainGroup = userGroupService.queryMainGroup(clusterUser.getId());

diff --git a/datasophon-ui/src/pages/systemCenter/user.vue b/datasophon-ui/src/pages/systemCenter/user.vue
@@ -238,6 +238,7 @@ export default {
     getUserList(key) {
       this.loading = true;
       let params = {
+        clusterId: Number(localStorage.getItem("clusterId") || -1),
         pageSize: this.pagination.pageSize,
         page: this.pagination.current,
       };