Commit f1a987e3bfe34f61a2ad4e81fd1b2366b8c54a20
1 parent
f8e0110d
fix:DEFECT-799 修复 平台管理员点开租户管理员时没有权限,编辑和删除有权限,编辑时回显为id
Showing
3 changed files
with
16 additions
and
8 deletions
... | ... | @@ -20,7 +20,7 @@ export type OtherParams = { |
20 | 20 | }; |
21 | 21 | |
22 | 22 | enum Api { |
23 | - userPage = '/user/page', | |
23 | + userPage = '/user/tenant/page', | |
24 | 24 | tenantPage = '/admin/tenant/page', |
25 | 25 | saveTenantAdmin = '/user/save_tenant_admin', |
26 | 26 | updateOrCreateTenant = '/admin/tenant/updateOrCreateTenant', |
... | ... | @@ -91,9 +91,17 @@ export function getTenantPage(params: TenantPageRequestParams) { |
91 | 91 | return getPageData<TenantDTO>(params, Api.tenantPage); |
92 | 92 | } |
93 | 93 | |
94 | -export function getTenantAdminPage(params: TenantAdminPageRequestParams) { | |
95 | - return getPageData<UserDTO>(params, Api.userPage); | |
96 | -} | |
94 | +// export function getTenantAdminPage(params: TenantAdminPageRequestParams) { | |
95 | +// return getPageData<UserDTO>(params, Api.userPage); | |
96 | +// } | |
97 | + | |
98 | +//分页 | |
99 | +export const getTenantAdminPage = (params: TenantAdminPageRequestParams) => { | |
100 | + return defHttp.get<TenantAdminPageRequestParams>({ | |
101 | + url: Api.userPage, | |
102 | + params, | |
103 | + }); | |
104 | +}; | |
97 | 105 | |
98 | 106 | export async function saveTenantAdmin(params: UserDTO) { |
99 | 107 | await defHttp.post({ | ... | ... |
... | ... | @@ -40,9 +40,9 @@ export interface TenantPageRequestParams extends BaseQueryParams { |
40 | 40 | |
41 | 41 | export interface TenantAdminPageRequestParams extends BaseQueryParams { |
42 | 42 | realName?: string; |
43 | - tenantCode: string; | |
43 | + // tenantCode: string; | |
44 | 44 | tenantId?: string; |
45 | - roleType?: string; | |
45 | + // roleType?: string; | |
46 | 46 | } |
47 | 47 | |
48 | 48 | export interface tenantProfileDTO { | ... | ... |
... | ... | @@ -46,7 +46,7 @@ |
46 | 46 | label: '删除', |
47 | 47 | icon: 'ant-design:delete-outlined', |
48 | 48 | tooltip: '删除', |
49 | - auth: 'api:yt:user:saveTenantAdmin:delete', | |
49 | + auth: 'api:yt:admin:user:deleteTenantAdmin:delete', | |
50 | 50 | color: 'error', |
51 | 51 | popConfirm: { |
52 | 52 | title: '是否确认删除', |
... | ... | @@ -192,7 +192,7 @@ |
192 | 192 | showIndexColumn: false, |
193 | 193 | searchInfo: { |
194 | 194 | tenantId, |
195 | - roleType: RoleEnum.TENANT_ADMIN, | |
195 | + // roleType: RoleEnum.TENANT_ADMIN, | |
196 | 196 | }, |
197 | 197 | actionColumn: { |
198 | 198 | width: 100, | ... | ... |