This commit is contained in:
parent
2f834d3644
commit
97e5b8abc3
1 changed files with 4 additions and 4 deletions
|
|
@ -572,8 +572,8 @@ export class KeycloakController extends Controller {
|
|||
.leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
|
||||
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
|
||||
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
|
||||
// .where("profile.keycloak IS NOT NULL AND profile.keycloak != ''")
|
||||
.where("profile.isDelete = :isDelete", { isDelete: false })
|
||||
.where("profile.keycloak IS NOT NULL AND profile.keycloak != ''")
|
||||
.andWhere("profile.isDelete = :isDelete", { isDelete: false })
|
||||
.andWhere(checkChildFromRole)
|
||||
.andWhere(conditions)
|
||||
.andWhere(
|
||||
|
|
@ -616,8 +616,8 @@ export class KeycloakController extends Controller {
|
|||
.leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
|
||||
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
|
||||
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
|
||||
// .where("profileEmployee.keycloak IS NOT NULL AND profileEmployee.keycloak != ''")
|
||||
.where("profileEmployee.isDelete = :isDelete", { isDelete: false })
|
||||
.where("profileEmployee.keycloak IS NOT NULL AND profileEmployee.keycloak != ''")
|
||||
.andWhere("profileEmployee.isDelete = :isDelete", { isDelete: false })
|
||||
.andWhere(checkChildFromRole)
|
||||
.andWhere(conditions)
|
||||
.andWhere({ employeeClass: "PERM" })
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue