From c98c73d78754bf9f6e48184c51df40a3abd1369c Mon Sep 17 00:00:00 2001 From: zhl Date: Sat, 8 May 2021 14:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=A7=92=E8=89=B2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0self:*=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/controllers/account.controller.ts | 8 ++++++++ src/models/admin/AdminRole.ts | 1 + 2 files changed, 9 insertions(+) diff --git a/src/admin/controllers/account.controller.ts b/src/admin/controllers/account.controller.ts index 8d6a2a8..65e925f 100644 --- a/src/admin/controllers/account.controller.ts +++ b/src/admin/controllers/account.controller.ts @@ -5,6 +5,7 @@ import { AdminRole } from 'models/admin/AdminRole' import { ZError } from 'common/ZError' import { generate_captcha } from '../../utils/captcha.util' import { isTrue } from '../../utils/string.util' +import { Shop } from '../../models/shop/Shop' class AccountController extends BaseController { @@ -115,8 +116,15 @@ class AccountController extends BaseController { for (let role of roleObjs) { role.permissions.forEach(permissionSet.add, permissionSet) } + permissionSet.add('self:*') let result: any = account.toJson() result.permissions = [...permissionSet] + if (account.department) { + const record = await Shop.findById(account.department) + if (record) { + result.deptname = record.name + } + } return result } diff --git a/src/models/admin/AdminRole.ts b/src/models/admin/AdminRole.ts index 1e917c2..b7ec871 100644 --- a/src/models/admin/AdminRole.ts +++ b/src/models/admin/AdminRole.ts @@ -29,6 +29,7 @@ export class AdminRoleClass extends BaseModule{ let records = await AdminRole.find(); let result = {}; for (let record of records) { + record.permissions.push('self:*') result[record._id] = { 'can': record.permissions, 'inherits': record.inherits