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

fix ส่วนราชการภายใต้หน่วยงานไม่แสดง

Browse source
This commit is contained in:
Bright 2024-11-13 14:47:27 +07:00
parent 174be3a53a
commit f953ba6d27
3 changed files with 65 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/controllers/ProfileController.ts
View file

@ -4428,6 +4428,10 @@ export class ProfileController extends Controller {
"posType", "posType",
"current_holders", "current_holders",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary", "profileSalary",
], ],
order: { order: {
@ -4444,6 +4448,10 @@ export class ProfileController extends Controller {
"posType", "posType",
"current_holders", "current_holders",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary", "profileSalary",
], ],
order: { order: {
@ -5287,6 +5295,10 @@ export class ProfileController extends Controller {
"posType", "posType",
"current_holders", "current_holders",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary", "profileSalary",
"profileEducations", "profileEducations",
], ],
@ -7000,7 +7012,16 @@ export class ProfileController extends Controller {
) { ) {
const profile = await this.profileRepo.findOne({ const profile = await this.profileRepo.findOne({
where: { keycloak: request.user.sub }, where: { keycloak: request.user.sub },
relations: ["posLevel", "posType", "current_holders", "current_holders.orgRoot"], relations: [
"posLevel",
"posType",
"current_holders",
"current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
],
}); });
if (!profile) { if (!profile) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ"); throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");

19
src/controllers/ProfileEmployeeController.ts
View file

@ -1856,6 +1856,10 @@ export class ProfileEmployeeController extends Controller {
"posType", "posType",
"current_holders", "current_holders",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary", "profileSalary",
], ],
order: { order: {
@ -2983,7 +2987,16 @@ export class ProfileEmployeeController extends Controller {
) { ) {
const profile = await this.profileRepo.findOne({ const profile = await this.profileRepo.findOne({
where: { keycloak: request.user.sub }, where: { keycloak: request.user.sub },
relations: ["posLevel", "posType", "current_holders", "current_holders.orgRoot"], relations: [
"posLevel",
"posType",
"current_holders",
"current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
],
}); });
if (!profile) { if (!profile) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ"); throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
@ -3838,6 +3851,10 @@ export class ProfileEmployeeController extends Controller {
"posType", "posType",
"current_holders", "current_holders",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary", "profileSalary",
"profileEducations" "profileEducations"
], ],

27
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1563,6 +1563,10 @@ export class ProfileEmployeeTempController extends Controller {
"posType", "posType",
"current_holders", "current_holders",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary", "profileSalary",
], ],
order: { order: {
@ -2614,7 +2618,16 @@ export class ProfileEmployeeTempController extends Controller {
) { ) {
const profile = await this.profileRepo.findOne({ const profile = await this.profileRepo.findOne({
where: { keycloak: request.user.sub }, where: { keycloak: request.user.sub },
relations: ["posLevel", "posType", "current_holders", "current_holders.orgRoot"], relations: [
"posLevel",
"posType",
"current_holders",
"current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
],
}); });
if (!profile) { if (!profile) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ"); throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
@ -3431,7 +3444,17 @@ export class ProfileEmployeeTempController extends Controller {
// await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP");//ไม่แน่ใจTEMPปิดไว้ก่อน // await new permission().PermissionGet(req, "SYS_REGISTRY_TEMP");//ไม่แน่ใจTEMPปิดไว้ก่อน
const profile = await this.profileRepo.findOne({ const profile = await this.profileRepo.findOne({
where: { id: id }, where: { id: id },
relations: ["posLevel", "posType", "current_holders", "current_holders.orgRoot", "profileEducations"], relations: [
"posLevel",
"posType",
"current_holders",
"current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileEducations"
],
order: { order: {
profileEducations: { profileEducations: {
createdAt: "DESC" createdAt: "DESC"