fix query
This commit is contained in:
parent
a45d3744e5
commit
e5dfed9312
2 changed files with 2 additions and 2 deletions
|
|
@ -5888,7 +5888,7 @@ export class ProfileController extends Controller {
|
||||||
)
|
)
|
||||||
// .andWhere("profile.leaveCommandId Is NOT NULL")
|
// .andWhere("profile.leaveCommandId Is NOT NULL")
|
||||||
.andWhere(
|
.andWhere(
|
||||||
"profileSalary.order = (SELECT MAX(ps.order) FROM profileSalary ps WHERE ps.profileId = profile.id and profileSalary.positionName != 'เกษียณอายุราชการ')",
|
"profileSalary.order = (SELECT MAX(ps.order) FROM profileSalary ps WHERE ps.profileId = profile.id and ps.positionName != 'เกษียณอายุราชการ')",
|
||||||
)
|
)
|
||||||
|
|
||||||
.andWhere(
|
.andWhere(
|
||||||
|
|
|
||||||
|
|
@ -2786,7 +2786,7 @@ export class ProfileEmployeeController extends Controller {
|
||||||
)
|
)
|
||||||
// .andWhere("profileEmployee.leaveCommandId Is NOT NULL")
|
// .andWhere("profileEmployee.leaveCommandId Is NOT NULL")
|
||||||
.andWhere(
|
.andWhere(
|
||||||
"profileSalary.order = (SELECT MAX(ps.order) FROM profileSalary ps WHERE ps.profileEmployeeId = profileEmployee.id and profileSalary.positionName != 'เกษียณอายุราชการ')",
|
"profileSalary.order = (SELECT MAX(ps.order) FROM profileSalary ps WHERE ps.profileEmployeeId = profileEmployee.id and ps.positionName != 'เกษียณอายุราชการ')",
|
||||||
)
|
)
|
||||||
|
|
||||||
// .andWhere(
|
// .andWhere(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue