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

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

Browse source
This commit is contained in:
Bright 2024-11-07 13:55:01 +07:00
commit e2d202d17c
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/ProfileEditEmployeeController.ts
View file

@ -160,10 +160,10 @@ export class ProfileEditEmployeeController extends Controller {
// return new HttpSuccess(getProfileEdit);
// }
@Get("{profileEmployeeId}")
public async detailProfileEditEmp(@Path() profileEmployeeId: string) {
@Get("{id}")
public async detailProfileEditEmp(@Path() id: string) {
const getProfileEdit = await this.profileEditRepository.findOne({
where: { profileEmployeeId: profileEmployeeId },
where: { id: id },
relations: ["profileEmployee"],
});
if (!getProfileEdit) {

3
src/entities/ProfileFamilyMother.ts
View file

@ -89,6 +89,7 @@ export type CreateProfileFamilyMother = {
motherPrefix: string | null;
motherFirstName: string | null;
motherLastName: string | null;
motherLastNameOld: string | null;
motherCareer: string | null;
motherCitizenId: string | null;
motherLive: boolean | null;
@ -99,6 +100,7 @@ export type CreateProfileEmployeeFamilyMother = {
motherPrefix: string | null;
motherFirstName: string | null;
motherLastName: string | null;
motherLastNameOld: string | null;
motherCareer: string | null;
motherCitizenId: string | null;
motherLive: boolean | null;
@ -108,6 +110,7 @@ export type UpdateProfileFamilyMother = {
motherPrefix: string | null;
motherFirstName: string | null;
motherLastName: string | null;
motherLastNameOld: string | null;
motherCareer: string | null;
motherCitizenId: string | null;
motherLive: boolean | null;