From 3036bb9e3d861fc6976251a4c012880da6e8e5ce Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Wed, 26 Mar 2025 15:23:18 +0700 Subject: [PATCH] add permissionProfile --- src/controllers/ProfileController.ts | 14 ++++++++++++++ src/controllers/ProfileEmployeeController.ts | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 6f768dfb..7db0ee09 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -77,6 +77,7 @@ import { ProfileActposition } from "../entities/ProfileActposition"; import { ProfileDuty } from "../entities/ProfileDuty"; import { ProfileAssessment } from "../entities/ProfileAssessment"; import { ProfileAbility } from "../entities/ProfileAbility"; +import { PermissionProfile } from "../entities/PermissionProfile"; @Route("api/v1/org/profile") @Tags("Profile") @@ -122,6 +123,7 @@ export class ProfileController extends Controller { private dutyRepository = AppDataSource.getRepository(ProfileDuty); private profileAssessmentsRepository = AppDataSource.getRepository(ProfileAssessment); private profileAbilityRepo = AppDataSource.getRepository(ProfileAbility); + private permissionProflileRepository = AppDataSource.getRepository(PermissionProfile); /** * report ประวัติแบบย่อ ข้าราชการ @@ -7251,6 +7253,16 @@ export class ProfileController extends Controller { }; }), ); + const permissionProflile = await this.permissionProflileRepository.findOne({ + relations : ["orgRootTree"], + where:{ + profileId: id, + orgRootTree:{ + orgRevisionId: orgRevisionPublish.id + } + } + }); + const _profile: any = { profileId: profile.id, prefix: profile.prefix, @@ -7305,6 +7317,8 @@ export class ProfileController extends Controller { ? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}` : "-", statusCheckEdit: profile.statusCheckEdit, + isEdit: permissionProflile?.isEdit??false, + isCheck: permissionProflile?.isCheck??false, }; if (_profile.child4Id != null) { diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 2766b6a3..8f4b4954 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -69,6 +69,7 @@ import axios from "axios"; import { Position } from "../entities/Position"; import { EmployeePosition } from "../entities/EmployeePosition"; import { deleteUser } from "../keycloak"; +import { PermissionProfile } from "../entities/PermissionProfile"; @Route("api/v1/org/profile-employee") @Tags("ProfileEmployee") @Security("bearerAuth") @@ -111,6 +112,7 @@ export class ProfileEmployeeController extends Controller { private profileLeaveRepository = AppDataSource.getRepository(ProfileLeave); private positionRepository = AppDataSource.getRepository(Position); private employeePositionRepository = AppDataSource.getRepository(EmployeePosition); + private permissionProflileRepository = AppDataSource.getRepository(PermissionProfile); /** * report ประวัติแบบย่อ ลูกจ้าง @@ -4704,6 +4706,15 @@ export class ProfileEmployeeController extends Controller { throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบแบบร่างโครงสร้าง"); } + const permissionProflile = await this.permissionProflileRepository.findOne({ + relations : ["orgRootTree"], + where:{ + profileId: id, + orgRootTree:{ + orgRevisionId: orgRevisionPublish.id + } + } + }); const posMaster = profile.current_holders == null || profile.current_holders.length == 0 || @@ -4814,6 +4825,8 @@ export class ProfileEmployeeController extends Controller { ? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}` : "-", statusCheckEdit: profile.statusCheckEdit, + isEdit: permissionProflile?.isEdit??false, + isCheck: permissionProflile?.isCheck??false, }; if (_profile.child4Id != null) {