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-07 11:10:58 +07:00
commit c06904c41d
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/EducationLevelController.ts
View file

@ -135,7 +135,7 @@ export class EducationLevelController extends Controller {
async detailEducationLevel(@Path() id: string) { async detailEducationLevel(@Path() id: string) {
const educationLevel = await this.educationLevelRepository.findOne({ const educationLevel = await this.educationLevelRepository.findOne({
where: { id }, where: { id },
select: ["id", "name", "rank"], select: ["id", "name", "rank", "createdAt", "lastUpdatedAt", "createdFullName", "lastUpdateFullName"],
}); });
if (!educationLevel) { if (!educationLevel) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
@ -156,7 +156,7 @@ export class EducationLevelController extends Controller {
@Get() @Get()
async listEducationLevel() { async listEducationLevel() {
const educationLevel = await this.educationLevelRepository.find({ const educationLevel = await this.educationLevelRepository.find({
select: ["id", "name", "createdAt", "lastUpdatedAt", "createdFullName", "lastUpdateFullName"], select: ["id", "name","rank", "createdAt", "lastUpdatedAt", "createdFullName", "lastUpdateFullName"],
order: { createdAt: "ASC" }, order: { createdAt: "ASC" },
}); });

2
src/controllers/PositionController.ts
View file

@ -492,7 +492,7 @@ export class PositionController extends Controller {
posMaster.orgRevisionId = orgRoot.orgRevisionId; posMaster.orgRevisionId = orgRoot.orgRevisionId;
} }
posMaster.createdUserId = request.user.sub; posMaster.createdUserId = request.user.sub; //สงสัยว่าทำให้ bug แก้ไขไม่ได้
posMaster.createdFullName = request.user.name; posMaster.createdFullName = request.user.name;
posMaster.lastUpdateUserId = request.user.sub; posMaster.lastUpdateUserId = request.user.sub;
posMaster.lastUpdateFullName = request.user.name; posMaster.lastUpdateFullName = request.user.name;

2
src/controllers/ReportController.ts
View file

@ -251,7 +251,6 @@ export class ReportController extends Controller {
posMaster.next_holder == null posMaster.next_holder == null
? "- ว่าง -" ? "- ว่าง -"
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
profilePosMasterNo: posMaster.next_holder == null ? null : "xxx", profilePosMasterNo: posMaster.next_holder == null ? null : "xxx",
profilePositionName: posMaster.next_holder == null ? positionName : "xxx", profilePositionName: posMaster.next_holder == null ? positionName : "xxx",
profilePosType: posMaster.next_holder == null ? posType : "xxx", profilePosType: posMaster.next_holder == null ? posType : "xxx",
@ -262,7 +261,6 @@ export class ReportController extends Controller {
// profilePosType: (positionOld == null ? null : positionOld.posType.posTypeName), // profilePosType: (positionOld == null ? null : positionOld.posType.posTypeName),
// profilePosLevel: (positionOld == null ? null : positionOld.posLevel.posLevelName), // profilePosLevel: (positionOld == null ? null : positionOld.posLevel.posLevelName),
// profilePositionField: (positionOld == null ? null : positionOld.positionField), // profilePositionField: (positionOld == null ? null : positionOld.positionField),
PositionName: positionName, PositionName: positionName,
PosType: posType, PosType: posType,
PosLevel: posLevel, PosLevel: posLevel,