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

update privilage validate (NORMAL) and update calRetireLaw

Browse source
This commit is contained in:
Adisak 2025-10-17 16:05:42 +07:00
parent 897dda67ad
commit 5cdcc2a91e
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controllers/OrganizationController.ts
View file

@ -1973,7 +1973,6 @@ export class OrganizationController extends Controller {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
}
let _privilege = await new permission().PermissionOrgList(request, "SYS_ORG");
// console.log("privilege>>>>",_privilege);
const attrOwnership = _privilege.root === null ? true : false;
@ -1988,17 +1987,22 @@ export class OrganizationController extends Controller {
?.find((x) => x.orgRevisionId === id)
?.posMasterAssigns.find((x) => x.assignId === "SYS_ORG");
// console.log("profileAssign>>>>",profileAssign);
if (orgRevision.orgRevisionIsDraft && !orgRevision.orgRevisionIsCurrent && !attrOwnership) {
_data.root = profile.permissionProfiles.map((x) => x.orgRootId);
}
// กำหนดการเข้าถึงข้อมูลตามสถานะและสิทธิ์
const isCurrentActive = !orgRevision.orgRevisionIsDraft && orgRevision.orgRevisionIsCurrent;
if (isCurrentActive) {
if (profileAssign && _privilege.privilege !== "OWNER") {
_data.root = [profile.current_holders.find((x) => x.orgRevisionId === id)?.orgRootId];
if(_privilege.privilege == "NORMAL"){
_data.root = [profile.current_holders.find((x) => x.orgRevisionId === id)?.orgRootId];
_data.child1 = [profile.current_holders.find((x) => x.orgRevisionId === id)?.orgChild1Id];
_data.child2 = [profile.current_holders.find((x) => x.orgRevisionId === id)?.orgChild2Id];
_data.child3 = [profile.current_holders.find((x) => x.orgRevisionId === id)?.orgChild3Id];
_data.child4 = [profile.current_holders.find((x) => x.orgRevisionId === id)?.orgChild4Id];
}else{
_data.root = [profile.current_holders.find((x) => x.orgRevisionId === id)?.orgRootId];
}
} else {
if (!attrOwnership) _data = _privilege;
}

1
src/controllers/ProfileController.ts
View file

@ -5262,6 +5262,7 @@ export class ProfileController extends Controller {
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลโปรไฟล์นี้");
Object.assign(record, body);
record.dateRetireLaw = calculateRetireLaw(record.birthDate);
record.prefixMain = record.prefix;
record.prefix = record.rank && record.rank.length > 0 ? record.rank : record.prefixMain;
record.createdUserId = request.user.sub;

1
src/controllers/ProfileEmployeeController.ts
View file

@ -2002,6 +2002,7 @@ export class ProfileEmployeeController extends Controller {
}
Object.assign(record, body);
record.dateRetireLaw = calculateRetireLaw(record.birthDate);
record.prefixMain = record.prefix;
record.prefix = record.rank && record.rank.length > 0 ? record.rank : record.prefixMain;
record.createdUserId = request.user.sub;

1
src/controllers/ProfileEmployeeTempController.ts
View file

@ -994,6 +994,7 @@ export class ProfileEmployeeTempController extends Controller {
}
Object.assign(record, body);
record.dateRetireLaw = calculateRetireLaw(record.birthDate);
record.prefixMain = record.prefix;
record.createdUserId = request.user.sub;
record.createdFullName = request.user.name;