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

fix bug ผู้ดำเนินการแสดงซ้ำ #2355
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m17s
Details

Browse source
This commit is contained in:
harid 2026-03-13 13:24:49 +07:00
parent 41f3c5ca54
commit 5d68a245a8
1 changed files with 70 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

135
src/controllers/CommandController.ts
View file

@ -2621,74 +2621,79 @@ export class CommandController extends Controller {
await this.commandRepository.save(command); await this.commandRepository.save(command);
} }
// insert commandOperator // insert commandOperator
if (request.user.sub) { const checkCommandOperator = await this.commandOperatorRepository.findOne({
const profile = await this.profileRepository.findOne({ where: { commandId: command.id, roleName: "เจ้าหน้าที่ดำเนินการ" },
where: { keycloak: request.user.sub }, });
relations: { if (!checkCommandOperator) {
posLevel: true, if (request.user.sub) {
posType: true, const profile = await this.profileRepository.findOne({
current_holders: { where: { keycloak: request.user.sub },
orgRevision: true, relations: {
orgRoot: true, posLevel: true,
orgChild1: true, posType: true,
orgChild2: true, current_holders: {
orgChild3: true, orgRevision: true,
orgChild4: true, orgRoot: true,
}, orgChild1: true,
}, orgChild2: true,
}); orgChild3: true,
if (profile) { orgChild4: true,
const currentHolder = profile!.current_holders?.find(
(x) =>
x.orgRevision?.orgRevisionIsDraft === false &&
x.orgRevision?.orgRevisionIsCurrent === true,
);
const posNo =
currentHolder != null && currentHolder.orgChild4 != null
? `${currentHolder.orgChild4.orgChild4ShortName} ${currentHolder.posMasterNo}`
: currentHolder != null && currentHolder.orgChild3 != null
? `${currentHolder.orgChild3.orgChild3ShortName} ${currentHolder.posMasterNo}`
: currentHolder != null && currentHolder.orgChild2 != null
? `${currentHolder.orgChild2.orgChild2ShortName} ${currentHolder.posMasterNo}`
: currentHolder != null && currentHolder.orgChild1 != null
? `${currentHolder.orgChild1.orgChild1ShortName} ${currentHolder.posMasterNo}`
: currentHolder != null && currentHolder?.orgRoot != null
? `${currentHolder.orgRoot.orgRootShortName} ${currentHolder.posMasterNo}`
: null;
const position = await this.positionRepository.findOne({
where: {
positionIsSelected: true,
posMaster: {
orgRevisionId: currentHolder?.orgRevisionId,
current_holderId: profile!.id,
}, },
}, },
order: { createdAt: "DESC" },
relations: { posExecutive: true },
}); });
const operator = Object.assign(new CommandOperator(), { if (profile) {
profileId: profile?.id, const currentHolder = profile!.current_holders?.find(
prefix: profile?.prefix, (x) =>
firstName: profile?.firstName, x.orgRevision?.orgRevisionIsDraft === false &&
lastName: profile?.lastName, x.orgRevision?.orgRevisionIsCurrent === true,
posNo: posNo, );
posType: profile?.posType?.posTypeName ?? null,
posLevel: profile?.posLevel?.posLevelName ?? null, const posNo =
position: position?.positionName ?? null, currentHolder != null && currentHolder.orgChild4 != null
positionExecutive: position?.posExecutive?.posExecutiveName ?? null, ? `${currentHolder.orgChild4.orgChild4ShortName} ${currentHolder.posMasterNo}`
roleName: "เจ้าหน้าที่ดำเนินการ", : currentHolder != null && currentHolder.orgChild3 != null
orderNo: 1, ? `${currentHolder.orgChild3.orgChild3ShortName} ${currentHolder.posMasterNo}`
commandId: command.id, : currentHolder != null && currentHolder.orgChild2 != null
createdUserId: request.user.sub, ? `${currentHolder.orgChild2.orgChild2ShortName} ${currentHolder.posMasterNo}`
createdFullName: request.user.name, : currentHolder != null && currentHolder.orgChild1 != null
createdAt: now, ? `${currentHolder.orgChild1.orgChild1ShortName} ${currentHolder.posMasterNo}`
lastUpdateUserId: request.user.sub, : currentHolder != null && currentHolder?.orgRoot != null
lastUpdateFullName: request.user.name, ? `${currentHolder.orgRoot.orgRootShortName} ${currentHolder.posMasterNo}`
lastUpdatedAt: now, : null;
});
await this.commandOperatorRepository.save(operator); const position = await this.positionRepository.findOne({
where: {
positionIsSelected: true,
posMaster: {
orgRevisionId: currentHolder?.orgRevisionId,
current_holderId: profile!.id,
},
},
order: { createdAt: "DESC" },
relations: { posExecutive: true },
});
const operator = Object.assign(new CommandOperator(), {
profileId: profile?.id,
prefix: profile?.prefix,
firstName: profile?.firstName,
lastName: profile?.lastName,
posNo: posNo,
posType: profile?.posType?.posTypeName ?? null,
posLevel: profile?.posLevel?.posLevelName ?? null,
position: position?.positionName ?? null,
positionExecutive: position?.posExecutive?.posExecutiveName ?? null,
roleName: "เจ้าหน้าที่ดำเนินการ",
orderNo: 1,
commandId: command.id,
createdUserId: request.user.sub,
createdFullName: request.user.name,
createdAt: now,
lastUpdateUserId: request.user.sub,
lastUpdateFullName: request.user.name,
lastUpdatedAt: now,
});
await this.commandOperatorRepository.save(operator);
}
} }
} }