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

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

View File

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