hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
Kittapath 2024-03-11 14:19:47 +07:00
commit 0f7edf5d15
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/OrgChild1Controller.ts
View file

@ -124,7 +124,7 @@ export class OrgChild1Controller {
},
});
if (chkCode != null) {
throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว");
throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว");
}
const order: any = await this.child1Repository.findOne({
where: {
@ -202,7 +202,7 @@ export class OrgChild1Controller {
},
});
if (chkCode != null) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว");
throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว");
}
child1.lastUpdateUserId = request.user.sub;
child1.lastUpdateFullName = request.user.name;

4
src/interfaces/utils.ts
View file

@ -35,7 +35,7 @@ export function calculateRetireDate(birthDate: Date) {
break;
}
if (flag) return new Date(`${yy + 60}-09-30T00:00:00.000Z`);
if (flag) return new Date(`${yy + 60}-09-30T00:00:00.000+07:00`);
return new Date(`${yy + 61}-09-30T00:00:00.000Z`);
return new Date(`${yy + 61}-09-30T00:00:00.000+07:00`);
}