Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

This commit is contained in:
kittapath 2024-12-13 21:10:43 +07:00
commit 2f5aef96f3

View file

@ -88,7 +88,7 @@ export class ReportController extends Controller {
TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) >= :minAge
AND TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) <= :maxAge
`, { minAge, maxAge })
.orderBy("posType.posTypeaName","ASC")
.orderBy("posType.posTypeName","ASC")
.getMany();
if(!rawdataProfile){
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
@ -189,6 +189,7 @@ export class ReportController extends Controller {
TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) >= :minAge
AND TIMESTAMPDIFF(YEAR, current_holder.birthDate, CURDATE()) <= :maxAge
`, { minAge, maxAge })
.orderBy("posType.posTypeName","ASC")
.getMany();
if(!rawdataProfile){
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");