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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source 
# Conflicts:
#	src/controllers/PositionController.ts
This commit is contained in:
kittapath 2024-11-26 15:20:07 +07:00
commit acb3434154
1 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/controllers/PositionController.ts
View file

@ -1411,6 +1411,8 @@ export class PositionController extends Controller {
} }
let findPosition: any; let findPosition: any;
let masterId = new Array(); let masterId = new Array();
let _authRoleId = new Array();
let _exitsRole = false;
if (body.keyword != null && body.keyword != "") { if (body.keyword != null && body.keyword != "") {
const findTypes: PosType[] = await this.posTypeRepository.find({ const findTypes: PosType[] = await this.posTypeRepository.find({
where: { posTypeName: Like(`%${body.keyword}%`) }, where: { posTypeName: Like(`%${body.keyword}%`) },
@ -1449,6 +1451,17 @@ export class PositionController extends Controller {
keywordAsInt = "P@ssw0rd!z"; keywordAsInt = "P@ssw0rd!z";
} }
masterId = [...new Set(masterId)]; masterId = [...new Set(masterId)];
//serch name สิทธิ์
_authRoleId = await this.authRoleRepo.find({
where: {
roleName: Like(`%${body.keyword}%`),
},
});
if (_authRoleId.length > 0) {
_exitsRole = true;
_authRoleId = [...new Set(_authRoleId.map((x) => x.id))];
}
} }
const revisionCondition = { const revisionCondition = {
@ -1477,11 +1490,20 @@ export class PositionController extends Controller {
.leftJoinAndSelect("posMaster.next_holder", "next_holder") .leftJoinAndSelect("posMaster.next_holder", "next_holder")
.leftJoinAndSelect("posMaster.orgRevision", "orgRevision") .leftJoinAndSelect("posMaster.orgRevision", "orgRevision")
.leftJoinAndSelect("posMaster.posMasterAssigns", "posMasterAssigns") .leftJoinAndSelect("posMaster.posMasterAssigns", "posMasterAssigns")
// .leftJoinAndSelect("posMaster.authRole", "authRole")
.leftJoinAndSelect("posMasterAssigns.assign", "assign") .leftJoinAndSelect("posMasterAssigns.assign", "assign")
.leftJoinAndSelect("current_holder.posType", "posType") .leftJoinAndSelect("current_holder.posType", "posType")
.leftJoinAndSelect("current_holder.posLevel", "posLevel") .leftJoinAndSelect("current_holder.posLevel", "posLevel")
.where(conditions) .where(conditions)
.orWhere(
new Brackets((qb) => {
if (body.keyword != null && body.keyword != "" && _exitsRole) {
qb.andWhere("posMaster.authRoleId IN (:...authRoleId)", { authRoleId: _authRoleId })
.andWhere(checkChildConditions)
.andWhere(typeCondition)
.andWhere(revisionCondition);
}
}),
)
.orWhere( .orWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.andWhere( qb.andWhere(
@ -1591,18 +1613,6 @@ export class PositionController extends Controller {
.take(body.pageSize) .take(body.pageSize)
.getManyAndCount(); .getManyAndCount();
//serch name สิทธิ์
// if(posMaster.length == 0 && body.keyword != null && body.keyword != "") {
// let _authRole:any;
// let _masterIdRole:any
// _authRole = await this.authRoleRepo.find({
// where: {
// roleName: Like(`%${body.keyword}%`),
// },
// relations: ["posMasters"]
// });
// _masterIdRole = [...new Set(_authRole.map((x: any) => x.posMasters.map((y: any) => y.id)).flat())];
// }
//แก้ค้นหา //แก้ค้นหา
let _position: any[] = []; let _position: any[] = [];
let x: any = null; let x: any = null;