no message

This commit is contained in:
Bright 2024-08-27 13:14:56 +07:00
parent eb1e797354
commit 82e21cd84c

View file

@ -34,6 +34,13 @@ export class PermissionController extends Controller {
@Get("") @Get("")
public async getPermission(@Request() request: { user: Record<string, any> }) { public async getPermission(@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,
@ -64,10 +71,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) {
@ -75,10 +83,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) {
@ -292,6 +301,13 @@ export class PermissionController extends Controller {
@Get("org") @Get("org")
public async listAuthSysOrg(@Request() request: RequestWithUser) { public async listAuthSysOrg(@Request() request: RequestWithUser) {
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,
@ -322,10 +338,11 @@ export class PermissionController extends Controller {
const posMaster = await this.posMasterRepository.findOne({ const posMaster = await this.posMasterRepository.findOne({
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) {
@ -350,10 +367,11 @@ export class PermissionController extends Controller {
const posMaster = await this.posMasterEmpRepository.findOne({ const posMaster = await this.posMasterEmpRepository.findOne({
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) {
@ -382,6 +400,13 @@ export class PermissionController extends Controller {
@Get("user/{id}") @Get("user/{id}")
public async listOrgUser(@Request() request: RequestWithUser, @Path() id: string) { public async listOrgUser(@Request() request: RequestWithUser, @Path() id: string) {
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,
@ -412,10 +437,11 @@ export class PermissionController extends Controller {
const posMaster = await this.posMasterRepository.findOne({ const posMaster = await this.posMasterRepository.findOne({
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) {
@ -440,10 +466,11 @@ export class PermissionController extends Controller {
const posMaster = await this.posMasterEmpRepository.findOne({ const posMaster = await this.posMasterEmpRepository.findOne({
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) {