mirroring/cool-admin-midway
1
0
Fork 0
mirror of https://github.com/cool-team-official/cool-admin-midway.git synced 2024-11-01 22:20:30 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105 from coder-huo/6.x

Browse Source 
fix bug in sys/role.ts change role to username
This commit is contained in:
COOL 2023-04-17 00:32:25 +08:00 committed by GitHub
commit be10208908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/base/controller/admin/sys/role.ts
View File

@ -21,7 +21,7 @@ import { BaseSysRoleService } from '../../../service/sys/role';
pageQueryOp: { pageQueryOp: {
keyWordLikeFields: ['name', 'label'], keyWordLikeFields: ['name', 'label'],
where: async (ctx: Context) => { where: async (ctx: Context) => {
const { userId, roleIds, role } = ctx.admin; const { userId, roleIds, username } = ctx.admin;
return [ return [
// 超级管理员的角色不展示 // 超级管理员的角色不展示
['label != :label', { label: 'admin' }], ['label != :label', { label: 'admin' }],
@ -29,7 +29,7 @@ import { BaseSysRoleService } from '../../../service/sys/role';
[ [
'(userId=:userId or id in (:roleIds))', '(userId=:userId or id in (:roleIds))',
{ userId, roleIds }, { userId, roleIds },
role !== 'admin', username !== 'admin',
], ],
]; ];
}, },