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

edit db

Browse source
This commit is contained in:
mamoss 2025-06-16 21:33:47 +07:00
parent 87619410af
commit d8da64afcf
2 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/controllers/ProfileController.ts
View file

@ -6320,6 +6320,7 @@ export class ProfileController extends Controller {
posNo: shortName, posNo: shortName,
rootId: root == null ? null : root.id, rootId: root == null ? null : root.id,
root: root == null ? null : root.orgRootName, root: root == null ? null : root.orgRootName,
rootDnaId: root == null ? null : root.ancestorDNA,
orgRootShortName: root == null ? null : root.orgRootShortName, orgRootShortName: root == null ? null : root.orgRootShortName,
orgRevisionId: root == null ? null : root.orgRevisionId, orgRevisionId: root == null ? null : root.orgRevisionId,
org: org:
@ -6848,13 +6849,11 @@ export class ProfileController extends Controller {
? null ? null
: position.posExecutive.posExecutiveName, : position.posExecutive.posExecutiveName,
positionExecutiveField: positionExecutiveField:
position == null || position.positionExecutiveField == null position == null || position.positionExecutiveField == null
? null ? null
: position.positionExecutiveField, : position.positionExecutiveField,
positionArea: positionArea:
position == null || position.positionArea == null position == null || position.positionArea == null ? null : position.positionArea,
? null
: position.positionArea,
posExecutivePriority: posExecutivePriority:
position == null || position.posExecutive == null position == null || position.posExecutive == null
? null ? null
@ -7014,13 +7013,11 @@ export class ProfileController extends Controller {
? null ? null
: position.posExecutive.posExecutiveName, : position.posExecutive.posExecutiveName,
positionExecutiveField: positionExecutiveField:
position == null || position.positionExecutiveField == null position == null || position.positionExecutiveField == null
? null ? null
: position.positionExecutiveField, : position.positionExecutiveField,
positionArea: positionArea:
position == null || position.positionArea == null position == null || position.positionArea == null ? null : position.positionArea,
? null
: position.positionArea,
posExecutivePriority: posExecutivePriority:
position == null || position.posExecutive == null position == null || position.posExecutive == null
? null ? null
@ -7832,9 +7829,7 @@ export class ProfileController extends Controller {
? null ? null
: position.positionExecutiveField, : position.positionExecutiveField,
positionArea: positionArea:
position == null || position.positionArea == null position == null || position.positionArea == null ? null : position.positionArea,
? null
: position.positionArea,
rootId: root == null ? null : root.id, rootId: root == null ? null : root.id,
rootDnaId: root == null ? null : root.ancestorDNA, rootDnaId: root == null ? null : root.ancestorDNA,
root: root == null ? null : root.orgRootName, root: root == null ? null : root.orgRootName,
@ -8028,13 +8023,11 @@ export class ProfileController extends Controller {
? null ? null
: position.posExecutive.posExecutiveName, : position.posExecutive.posExecutiveName,
positionExecutiveField: positionExecutiveField:
position == null || position.positionExecutiveField == null position == null || position.positionExecutiveField == null
? null ? null
: position.positionExecutiveField, : position.positionExecutiveField,
positionArea: positionArea:
position == null || position.positionArea == null position == null || position.positionArea == null ? null : position.positionArea,
? null
: position.positionArea,
orgRevisionId: root == null ? null : root.orgRevisionId, orgRevisionId: root == null ? null : root.orgRevisionId,
rootId: root == null ? null : root.id, rootId: root == null ? null : root.id,
rootDnaId: root == null ? null : root.ancestorDNA, rootDnaId: root == null ? null : root.ancestorDNA,
@ -9959,15 +9952,17 @@ export class ProfileController extends Controller {
position == null || position == null ||
item.current_holders item.current_holders
.find((x) => x.orgRevisionId == findRevision.id) .find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.positionExecutiveField == ?.positions?.find((position) => position.positionIsSelected == true)
null || ?.positionExecutiveField == null ||
item.current_holders item.current_holders
.find((x) => x.orgRevisionId == findRevision.id) .find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.positionExecutiveField == null ?.positions?.find((position) => position.positionIsSelected == true)
?.positionExecutiveField == null
? null ? null
: item.current_holders : item.current_holders
.find((x) => x.orgRevisionId == findRevision.id) .find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.positionExecutiveField; ?.positions?.find((position) => position.positionIsSelected == true)
?.positionExecutiveField;
const positionArea = const positionArea =
position == null || position == null ||

2
src/entities/ProfileHonor.ts
View file

@ -132,6 +132,6 @@ export type UpdateProfileHonor = {
refCommandDate?: Date | null; refCommandDate?: Date | null;
refCommandNo?: string | null; refCommandNo?: string | null;
type?: string | null; type?: string | null;
isDate: boolean | null; isDate?: boolean | null;
isUpload?: boolean | null; isUpload?: boolean | null;
}; };