diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 64cff0b8..0f775d6f 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -6320,6 +6320,7 @@ export class ProfileController extends Controller { posNo: shortName, rootId: root == null ? null : root.id, root: root == null ? null : root.orgRootName, + rootDnaId: root == null ? null : root.ancestorDNA, orgRootShortName: root == null ? null : root.orgRootShortName, orgRevisionId: root == null ? null : root.orgRevisionId, org: @@ -6848,13 +6849,11 @@ export class ProfileController extends Controller { ? null : position.posExecutive.posExecutiveName, positionExecutiveField: - position == null || position.positionExecutiveField == null - ? null - : position.positionExecutiveField, + position == null || position.positionExecutiveField == null + ? null + : position.positionExecutiveField, positionArea: - position == null || position.positionArea == null - ? null - : position.positionArea, + position == null || position.positionArea == null ? null : position.positionArea, posExecutivePriority: position == null || position.posExecutive == null ? null @@ -7014,13 +7013,11 @@ export class ProfileController extends Controller { ? null : position.posExecutive.posExecutiveName, positionExecutiveField: - position == null || position.positionExecutiveField == null - ? null - : position.positionExecutiveField, + position == null || position.positionExecutiveField == null + ? null + : position.positionExecutiveField, positionArea: - position == null || position.positionArea == null - ? null - : position.positionArea, + position == null || position.positionArea == null ? null : position.positionArea, posExecutivePriority: position == null || position.posExecutive == null ? null @@ -7832,9 +7829,7 @@ export class ProfileController extends Controller { ? null : position.positionExecutiveField, positionArea: - position == null || position.positionArea == null - ? null - : position.positionArea, + position == null || position.positionArea == null ? null : position.positionArea, rootId: root == null ? null : root.id, rootDnaId: root == null ? null : root.ancestorDNA, root: root == null ? null : root.orgRootName, @@ -8028,13 +8023,11 @@ export class ProfileController extends Controller { ? null : position.posExecutive.posExecutiveName, positionExecutiveField: - position == null || position.positionExecutiveField == null - ? null - : position.positionExecutiveField, + position == null || position.positionExecutiveField == null + ? null + : position.positionExecutiveField, positionArea: - position == null || position.positionArea == null - ? null - : position.positionArea, + position == null || position.positionArea == null ? null : position.positionArea, orgRevisionId: root == null ? null : root.orgRevisionId, rootId: root == null ? null : root.id, rootDnaId: root == null ? null : root.ancestorDNA, @@ -9959,15 +9952,17 @@ export class ProfileController extends Controller { position == null || item.current_holders .find((x) => x.orgRevisionId == findRevision.id) - ?.positions?.find((position) => position.positionIsSelected == true)?.positionExecutiveField == - null || + ?.positions?.find((position) => position.positionIsSelected == true) + ?.positionExecutiveField == null || item.current_holders .find((x) => x.orgRevisionId == findRevision.id) - ?.positions?.find((position) => position.positionIsSelected == true)?.positionExecutiveField == null + ?.positions?.find((position) => position.positionIsSelected == true) + ?.positionExecutiveField == null ? null : item.current_holders .find((x) => x.orgRevisionId == findRevision.id) - ?.positions?.find((position) => position.positionIsSelected == true)?.positionExecutiveField; + ?.positions?.find((position) => position.positionIsSelected == true) + ?.positionExecutiveField; const positionArea = position == null || diff --git a/src/entities/ProfileHonor.ts b/src/entities/ProfileHonor.ts index 88f390cb..481e195f 100644 --- a/src/entities/ProfileHonor.ts +++ b/src/entities/ProfileHonor.ts @@ -132,6 +132,6 @@ export type UpdateProfileHonor = { refCommandDate?: Date | null; refCommandNo?: string | null; type?: string | null; - isDate: boolean | null; + isDate?: boolean | null; isUpload?: boolean | null; };