hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix error

Browse source
This commit is contained in:
Bright 2024-08-27 11:47:03 +07:00
parent 5a688215e7
commit 3ffff67ba8
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/controllers/PermissionController.ts
View file

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