Merge pull request #243 from sj-distributor/Fixed-tree-already-select…

…-bug Fixed tree already select bug
sj-distributor · Mar 5, 2024 · e380675 · e380675
2 parents 3ca86a8 + 030ba36
commit e380675
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/web/package.json b/web/package.json
@@ -31,6 +31,7 @@
     "moment": "^2.29.4",
     "node-sass": "^8.0.0",
     "notistack": "^3.0.1",
+    "query-string": "^8.0.0",
     "ramda": "^0.28.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/web/src/api/role-user-permissions/index.ts b/web/src/api/role-user-permissions/index.ts
@@ -1,3 +1,4 @@
+import queryString from "query-string";
 import {
   IAddRoleUsersDto,
   IDeleteRole,
@@ -19,10 +20,10 @@ export const GetCurrentRolesByPermissions = async () => {
 
 // 获取用户list
 export const GetRoleUser = async (data: IRoleUserPageDto) => {
+  const newQueryString = queryString.stringify(data);
+
   return await Get<IRoleUserResponse>(
-    `/api/Security/role/users?PageIndex=${data.PageIndex + 1}&PageSize=${
-      data.PageSize
-    }&RoleId=${data.RoleId}&Keyword=${data.Keyword}`
+    `/api/Security/role/users?${newQueryString}`
   );
 };
 
@@ -43,11 +44,6 @@ export const GetTreeList = async () => {
   );
 };
 
-//获取全部角色用户列表
-export const GetRoleUserList = async () => {
-  return await Get<IRoleUserResponse>(`/api/Security/role/users`);
-};
-
 // 获取功能权限
 export const GetPermissions = async () => {
   return await Get<IPermissionsDto>("/api/Security/permissions");

diff --git a/web/src/dtos/role-user-permissions/index.ts b/web/src/dtos/role-user-permissions/index.ts
@@ -1,8 +1,8 @@
 export interface IRoleUserPageDto {
-  PageIndex: number;
-  PageSize: number;
+  PageIndex?: number;
+  PageSize?: number;
   RoleId: string;
-  Keyword: string;
+  Keyword?: string;
 }
 
 export interface IRoleUserResponse {

diff --git a/web/src/pages/role-perimission/components/add-users-model/hook.ts b/web/src/pages/role-perimission/components/add-users-model/hook.ts
@@ -6,7 +6,7 @@ import { useSnackbar } from "notistack";
 import { ModalBoxRef } from "../../../../dtos/modal";
 import {
   AddRoleUser,
-  GetRoleUserList,
+  GetRoleUser,
   GetTreeList,
 } from "../../../../api/role-user-permissions";
 import {
@@ -90,7 +90,9 @@ export const useAction = (props: {
   };
 
   const handleTotalRoleUserList = () => {
-    GetRoleUserList()
+    GetRoleUser({
+      RoleId: roleId,
+    })
       .then((res) => {
         setTotalRoleUserList(res?.roleUsers ?? []);
       })

diff --git a/web/src/pages/role-perimission/components/user-list/hook.ts b/web/src/pages/role-perimission/components/user-list/hook.ts
@@ -84,7 +84,7 @@ export const useAction = () => {
     setLoading(true);
 
     GetRoleUser({
-      PageIndex: pageDto.PageIndex,
+      PageIndex: (pageDto.PageIndex ?? 0) + 1,
       PageSize: pageDto.PageSize,
       RoleId: pageDto.RoleId,
       Keyword: inputVal,