Merge branch 'develop' into adiDev
This commit is contained in:
commit
1d6ecd3e67
1 changed files with 1 additions and 0 deletions
|
|
@ -650,6 +650,7 @@ export class SalaryPeriodController extends Controller {
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.orderBy("profile.citizenId", "ASC")
|
.orderBy("profile.citizenId", "ASC")
|
||||||
|
.addOrderBy("profile.isReserve", "ASC")
|
||||||
.skip((body.page - 1) * body.pageSize)
|
.skip((body.page - 1) * body.pageSize)
|
||||||
.take(body.pageSize)
|
.take(body.pageSize)
|
||||||
.getManyAndCount();
|
.getManyAndCount();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue