diff --git a/src/admin/controllers/role.controller.ts b/src/admin/controllers/role.controller.ts index 9cda5bd..4e36fa6 100644 --- a/src/admin/controllers/role.controller.ts +++ b/src/admin/controllers/role.controller.ts @@ -7,8 +7,8 @@ class RoleController extends BaseController { @permission('role:update') @router('post /roles') async saveRole(req) { - let {name, permissions, key} = req.params; - let role = (await AdminRole.findOrCreate({_id: key})).doc; + const {name, permissions, key} = req.params; + const role = (await AdminRole.findOrCreate({_id: key})).doc; role.permissions = permissions; role.name = name; await role.save(); @@ -20,22 +20,22 @@ class RoleController extends BaseController { @router('get /roles') async roles(req) { const user = req.user - let queryData: any = {} + const queryData: any = {} if (!user.isSysAdmin()) { queryData.show = true } - let records = await AdminRole.find(queryData) + const records = await AdminRole.find(queryData) return records.map(o => o.toJson()) } @permission('role:delete') @router('delete /roles/:key') async deleteRole(req) { - let {key} = req.params; + const {key} = req.params; if (!key) { throw new ZError(10, 'record not found'); } - let result = await AdminRole.deleteOne({_id: key}); + const result = await AdminRole.deleteOne({_id: key}); return {count: result.deletedCount} } diff --git a/src/admin/controllers/shop.controller.ts b/src/admin/controllers/shop.controller.ts index 2b5f75d..e9d8c26 100644 --- a/src/admin/controllers/shop.controller.ts +++ b/src/admin/controllers/shop.controller.ts @@ -49,6 +49,7 @@ export default class ShopController extends BaseController { if (!_id) { record = new Shop(req.params) record.createdBy = user.id + record.show = true } else { record = await Shop.findById(_id) record.updateFromReq(req.params) diff --git a/src/models/shop/Shop.ts b/src/models/shop/Shop.ts index bf7a0b1..394fbd6 100644 --- a/src/models/shop/Shop.ts +++ b/src/models/shop/Shop.ts @@ -41,6 +41,13 @@ class ShopClass extends FindOrCreate { */ @prop() public createdBy: string + /** + * 一些系统级的店铺不需要显示 + * @type {boolean} + */ + @noJson() + @prop({default: true}) + public show: boolean public updateFromReq(data: any) { @@ -63,7 +70,7 @@ class ShopClass extends FindOrCreate { public static parseQueryParam(params) { let {key, timeBegin, timeEnd} = params - let opt: any = {deleted: false} + let opt: any = {deleted: false, show: true} if (key) { opt.name = {$regex: key, $options: 'i'} }