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

comment code

Browse source
This commit is contained in:
Adisak 2026-06-12 11:31:33 +07:00
parent 1b1a234bfb
commit 7c1a838600
2 changed files with 84 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

121
src/controllers/PermissionProfileController.ts
View file

@ -65,7 +65,8 @@ export class PermissionProfileController extends Controller {
if (!request.user.role.includes("SUPER_ADMIN")) { if (!request.user.role.includes("SUPER_ADMIN")) {
rootId = rootId =
orgRevisionActive?.posMasters?.filter((x) => x.current_holderId == profile.id)[0] orgRevisionActive?.posMasters?.filter((x) => x.next_holderId == profile.id)[0]
// orgRevisionActive?.posMasters?.filter((x) => x.current_holderId == profile.id)[0]
?.orgRootId || null; ?.orgRootId || null;
if (!rootId) return new HttpSuccess([]); if (!rootId) return new HttpSuccess([]);
} }
@ -165,59 +166,59 @@ export class PermissionProfileController extends Controller {
_data.current_holders.length == 0 _data.current_holders.length == 0
? null ? null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null && : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 != _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
null null
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null && : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild3 != null ?.orgChild3 != null
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null && : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild2 != null ?.orgChild2 != null
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null && : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild1 != null ?.orgChild1 != null
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
null && null &&
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgRoot != null ?.orgRoot != null
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: null; : null;
const root = const root =
_data.current_holders.length == 0 || _data.current_holders.length == 0 ||
(_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null && (_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null) _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
? null ? null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot; : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
const child1 = const child1 =
_data.current_holders == null || _data.current_holders == null ||
_data.current_holders.length == 0 || _data.current_holders.length == 0 ||
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
? null ? null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1; : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1;
const child2 = const child2 =
_data.current_holders == null || _data.current_holders == null ||
_data.current_holders.length == 0 || _data.current_holders.length == 0 ||
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
? null ? null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2; : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2;
const child3 = const child3 =
_data.current_holders == null || _data.current_holders == null ||
_data.current_holders.length == 0 || _data.current_holders.length == 0 ||
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
? null ? null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3; : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3;
const child4 = const child4 =
_data.current_holders == null || _data.current_holders == null ||
_data.current_holders.length == 0 || _data.current_holders.length == 0 ||
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
? null ? null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4; : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4;
@ -363,78 +364,78 @@ export class PermissionProfileController extends Controller {
_data.profileTree.current_holders.length == 0 _data.profileTree.current_holders.length == 0
? null ? null
: _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) != : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
null && null &&
_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild4 != null ?.orgChild4 != null
? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) != : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
null && null &&
_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild3 != null ?.orgChild3 != null
? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: _data.profileTree.current_holders.find( : _data.profileTree.current_holders.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
) != null && ) != null &&
_data.profileTree.current_holders.find( _data.profileTree.current_holders.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.orgChild2 != null )?.orgChild2 != null
? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: _data.profileTree.current_holders.find( : _data.profileTree.current_holders.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
) != null && ) != null &&
_data.profileTree.current_holders.find( _data.profileTree.current_holders.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.orgChild1 != null )?.orgChild1 != null
? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: _data.profileTree.current_holders.find( : _data.profileTree.current_holders.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
) != null && ) != null &&
_data.profileTree.current_holders.find( _data.profileTree.current_holders.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.orgRoot != null )?.orgRoot != null
? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: null; : null;
const root = const root =
_data.profileTree.current_holders.length == 0 || _data.profileTree.current_holders.length == 0 ||
(_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) != (_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
null && null &&
_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgRoot == null) ?.orgRoot == null)
? null ? null
: _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgRoot; ?.orgRoot;
const child1 = const child1 =
_data.profileTree.current_holders == null || _data.profileTree.current_holders == null ||
_data.profileTree.current_holders.length == 0 || _data.profileTree.current_holders.length == 0 ||
_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
? null ? null
: _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild1; ?.orgChild1;
const child2 = const child2 =
_data.profileTree.current_holders == null || _data.profileTree.current_holders == null ||
_data.profileTree.current_holders.length == 0 || _data.profileTree.current_holders.length == 0 ||
_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
? null ? null
: _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild2; ?.orgChild2;
const child3 = const child3 =
_data.profileTree.current_holders == null || _data.profileTree.current_holders == null ||
_data.profileTree.current_holders.length == 0 || _data.profileTree.current_holders.length == 0 ||
_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
? null ? null
: _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild3; ?.orgChild3;
const child4 = const child4 =
_data.profileTree.current_holders == null || _data.profileTree.current_holders == null ||
_data.profileTree.current_holders.length == 0 || _data.profileTree.current_holders.length == 0 ||
_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
? null ? null
: _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild4; ?.orgChild4;
let _root = root?.orgRootName; let _root = root?.orgRootName;
let _child1 = child1?.orgChild1Name; let _child1 = child1?.orgChild1Name;

46
src/services/rabbitmq.ts
View file

@ -492,14 +492,14 @@ async function handler_command_noti(msg: amqp.ConsumeMessage): Promise<boolean>
let profilesSend = let profilesSend =
command && command.commandSends.length > 0 command && command.commandSends.length > 0
? command.commandSends ? command.commandSends
.filter((x: any) => x.profileId != null) .filter((x: any) => x.profileId != null)
.map((x: any) => ({ .map((x: any) => ({
receiverUserId: x.profileId, receiverUserId: x.profileId,
notiLink: "", notiLink: "",
isSendMail: x.commandSendCCs.map((x: any) => x.name == "EMAIL").length > 0, isSendMail: x.commandSendCCs.map((x: any) => x.name == "EMAIL").length > 0,
isSendInbox: x.commandSendCCs.map((x: any) => x.name == "INBOX").length > 0, isSendInbox: x.commandSendCCs.map((x: any) => x.name == "INBOX").length > 0,
isSendNotification: true, isSendNotification: true,
})) }))
: []; : [];
const payloadStr = await PayloadSendNoti(command.id); const payloadStr = await PayloadSendNoti(command.id);
const profilesSendRequest = new CallAPI() const profilesSendRequest = new CallAPI()
@ -1719,23 +1719,23 @@ async function clearMenuAndRoleCache(): Promise<void> {
console.log(`[AMQ] Cleared ${roleKeys.length} role cache keys`); console.log(`[AMQ] Cleared ${roleKeys.length} role cache keys`);
} }
const posMasterKeys = await keysAsync("posMaster_*"); // const posMasterKeys = await keysAsync("posMaster_*");
if (posMasterKeys.length > 0) { // if (posMasterKeys.length > 0) {
await delAsync(...posMasterKeys); // await delAsync(...posMasterKeys);
console.log(`[AMQ] Cleared ${posMasterKeys.length} posMaster cache keys`); // console.log(`[AMQ] Cleared ${posMasterKeys.length} posMaster cache keys`);
} // }
const userKeys = await keysAsync("user_*"); // const userKeys = await keysAsync("user_*");
if (userKeys.length > 0) { // if (userKeys.length > 0) {
await delAsync(...userKeys); // await delAsync(...userKeys);
console.log(`[AMQ] Cleared ${userKeys.length} user cache keys`); // console.log(`[AMQ] Cleared ${userKeys.length} user cache keys`);
} // }
const orgKeys = await keysAsync("org_*"); // const orgKeys = await keysAsync("org_*");
if (orgKeys.length > 0) { // if (orgKeys.length > 0) {
await delAsync(...orgKeys); // await delAsync(...orgKeys);
console.log(`[AMQ] Cleared ${orgKeys.length} org cache keys`); // console.log(`[AMQ] Cleared ${orgKeys.length} org cache keys`);
} // }
} finally { } finally {
redisClient.quit(); redisClient.quit();
} }