diff --git a/src/controllers/PermissionController.ts b/src/controllers/PermissionController.ts index 70425dc0..840bd703 100644 --- a/src/controllers/PermissionController.ts +++ b/src/controllers/PermissionController.ts @@ -14,6 +14,7 @@ import { In } from "typeorm"; import permission from "../interfaces/permission"; import { ProfileEmployee } from "../entities/ProfileEmployee"; import { EmployeePosMaster } from "../entities/EmployeePosMaster"; +import { OrgRevision } from "../entities/OrgRevision"; const REDIS_HOST = process.env.REDIS_HOST; const REDIS_PORT = process.env.REDIS_PORT; @@ -28,6 +29,7 @@ export class PermissionController extends Controller { private authRoleRepo = AppDataSource.getRepository(AuthRole); private authRoleAttrRepo = AppDataSource.getRepository(AuthRoleAttr); private authSysRepo = AppDataSource.getRepository(AuthSys); + private orgRevisionRepository = AppDataSource.getRepository(OrgRevision); private redis = require("redis"); @Get("") @@ -118,6 +120,13 @@ export class PermissionController extends Controller { @Get("menu") public async listAuthSys(@Request() request: { user: Record }) { + const orgRevision = await this.orgRevisionRepository.findOne({ + select: ["id"], + where: { + orgRevisionIsDraft: false, + orgRevisionIsCurrent: true, + }, + }); const redisClient = await this.redis.createClient({ host: REDIS_HOST, port: REDIS_PORT, @@ -148,10 +157,11 @@ export class PermissionController extends Controller { select: ["authRoleId"], where: { current_holderId: profile.id, - orgRevision: { - orgRevisionIsDraft: false, - orgRevisionIsCurrent: true, - }, + // orgRevision: { + // orgRevisionIsDraft: false, + // orgRevisionIsCurrent: true, + // }, + orgRevisionId: orgRevision?.id }, }); if (!posMaster) { @@ -159,10 +169,11 @@ export class PermissionController extends Controller { select: ["authRoleId"], where: { current_holderId: profile.id, - orgRevision: { - orgRevisionIsDraft: false, - orgRevisionIsCurrent: true, - }, + // orgRevision: { + // orgRevisionIsDraft: false, + // orgRevisionIsCurrent: true, + // }, + orgRevisionId: orgRevision?.id }, }); if (!posMaster) {