diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index 8e0a440..2841e91 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -2580,6 +2580,7 @@ export class DevelopmentController extends Controller { where: { developmentId: id }, relations: ["posLevel", "posType", "employeePosLevel", "employeePosType"], order: { + no: "ASC", isDone: "ASC", isDoneIDP: "ASC", citizenId: "ASC", @@ -2587,6 +2588,7 @@ export class DevelopmentController extends Controller { }, }); const _getDevelopment = getDevelopment.map((item) => ({ + no: item.no, id: item.id, type: item.type, idcard: item.citizenId, diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts index a39889b..5426e6b 100644 --- a/src/controllers/DevelopmentScholarshipController.ts +++ b/src/controllers/DevelopmentScholarshipController.ts @@ -330,7 +330,7 @@ export class DevelopmentScholarshipController extends Controller { id: item.id, year: item.scholarshipYear, citizenId: item.citizenId, - fullName: `${item.prefix ?? ""}${item.firstName ?? ""} ${item.lastName ?? ""}`, + fullName: `${item.prefix ?? ""}${item.firstName ?? ""} ${item.lastName ?? ""}`.trim(), position: item.position, posType: item.posType ? item.posType.posTypeName : null, posLevel: item.posLevel ? item.posLevel.posLevelName : null, @@ -339,7 +339,7 @@ export class DevelopmentScholarshipController extends Controller { scholarshipType: item.scholarshipType, startDate: item.startDate, endDate: item.endDate, - fullNameGuarantor: `${item.guarantorPrefix ?? ""}${item.guarantorFirstName ?? ""} ${item.guarantorLastName ?? ""}` , + fullNameGuarantor: `${item.guarantorPrefix ?? ""}${item.guarantorFirstName ?? ""} ${item.guarantorLastName ?? ""}`.trim(), guarantorCitizenId: item.guarantorCitizenId, }));