no message
This commit is contained in:
parent
94f92b5c9a
commit
2689d86386
2 changed files with 14 additions and 10 deletions
|
|
@ -1439,7 +1439,7 @@ export class ProfileEmployeeController extends Controller {
|
|||
.leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
|
||||
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
|
||||
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
|
||||
.where("current_holders.orgRevisionId = :orgRevisionId", {orgRevisionId: findRevision.id})
|
||||
.where("current_holders.orgRevisionId = :orgRevisionId", { orgRevisionId: findRevision.id })
|
||||
.andWhere(
|
||||
_data.root != undefined && _data.root != null
|
||||
? _data.root[0] != null
|
||||
|
|
@ -3759,6 +3759,7 @@ export class ProfileEmployeeController extends Controller {
|
|||
where: {
|
||||
keycloak: IsNull(),
|
||||
citizenId: Like(`%${body.keyword}%`),
|
||||
employeeClass: "PREM",
|
||||
},
|
||||
relations: ["posType", "posLevel", "current_holders", "profileSalary"],
|
||||
skip,
|
||||
|
|
@ -3771,6 +3772,7 @@ export class ProfileEmployeeController extends Controller {
|
|||
where: {
|
||||
keycloak: IsNull(),
|
||||
firstName: Like(`%${body.keyword}%`),
|
||||
employeeClass: "PREM",
|
||||
},
|
||||
relations: ["posType", "posLevel", "current_holders", "profileSalary"],
|
||||
skip,
|
||||
|
|
@ -3783,6 +3785,7 @@ export class ProfileEmployeeController extends Controller {
|
|||
where: {
|
||||
keycloak: IsNull(),
|
||||
lastName: Like(`%${body.keyword}%`),
|
||||
employeeClass: "PREM",
|
||||
},
|
||||
relations: ["posType", "posLevel", "current_holders", "profileSalary"],
|
||||
skip,
|
||||
|
|
@ -3794,6 +3797,7 @@ export class ProfileEmployeeController extends Controller {
|
|||
[findProfile, total] = await this.profileRepo.findAndCount({
|
||||
where: {
|
||||
keycloak: IsNull(),
|
||||
employeeClass: "PREM",
|
||||
},
|
||||
relations: ["posType", "posLevel", "current_holders", "profileSalary"],
|
||||
skip,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue