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-02-20 17:12:28 +07:00
commit 8fe7d295fe
6 changed files with 61 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/PositionController.ts
View file

@ -121,6 +121,7 @@ export class PositionController extends Controller {
posExecutiveId: String(posDict.posExecutiveId),
posDictExecutiveField: posDict.posDictExecutiveField,
posDictArea: posDict.posDictArea,
isSpecial: posDict.isSpecial,
},
});
if (rowRepeated) {
@ -268,6 +269,7 @@ export class PositionController extends Controller {
posExecutiveName: item.posExecutive == null ? null : item.posExecutive.posExecutiveName,
positionExecutiveField: item.posDictExecutiveField,
positionArea: item.posDictArea,
isSpecial: item.isSpecial,
positionIsSelected: false,
};
}),
@ -359,9 +361,7 @@ export class PositionController extends Controller {
const dataDup: any = await this.posMasterRepository.findOne({
where: {
orgChild4Id: orgChild4.id,
posMasterNoPrefix: requestBody.posMasterNoPrefix,
posMasterNo: requestBody.posMasterNo,
posMasterNoSuffix: requestBody.posMasterNoSuffix,
},
});
if (dataDup != null)
@ -530,6 +530,7 @@ export class PositionController extends Controller {
position.posExecutiveId = x.posExecutiveId;
position.positionExecutiveField = x.posDictExecutiveField;
position.positionArea = x.posDictArea;
position.isSpecial = x.isSpecial;
position.positionIsSelected = false;
position.posMasterId = posMaster.id;
position.createdUserId = request.user.sub;
@ -746,6 +747,7 @@ export class PositionController extends Controller {
position.posExecutiveId = x.posExecutiveId;
position.positionExecutiveField = x.posDictExecutiveField;
position.positionArea = x.posDictArea;
position.isSpecial = x.isSpecial;
position.positionIsSelected = false;
position.posMasterId = posMaster.id;
position.createdUserId = request.user.sub;
@ -796,6 +798,7 @@ export class PositionController extends Controller {
positionExecutiveField: position.positionExecutiveField,
positionArea: position.positionArea,
positionIsSelected: position.positionIsSelected,
isSpecial: position.isSpecial,
})),
};
return new HttpSuccess(formattedData);
@ -1140,6 +1143,7 @@ export class PositionController extends Controller {
positionExecutiveField: position.positionExecutiveField,
positionArea: position.positionArea,
positionIsSelected: position.positionIsSelected,
isSpecial: position.isSpecial,
})),
};
}),
@ -2283,6 +2287,7 @@ export class PositionController extends Controller {
positionExecutiveField: position.positionExecutiveField,
positionArea: position.positionArea,
positionIsSelected: position.positionIsSelected,
isSpecial: position.isSpecial,
})),
};
}),

5
src/controllers/ProfileController.ts
View file

@ -155,7 +155,10 @@ export class ProfileController extends Controller {
}
const checkCitizenId = await this.profileRepository.findOne({
where: { citizenId: requestBody.citizenId },
where: {
id: Not(id),
citizenId: requestBody.citizenId ,
},
});
if (checkCitizenId) {