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

fix ปลดจากกิ่ง ยกเว้นคำสั่ง25 26

Browse source
This commit is contained in:
Bright 2024-10-28 18:01:36 +07:00
parent 2f378fa4a1
commit 1b3f42fd85
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/CommandController.ts
View file

@ -39,6 +39,7 @@ import {
commandTypePath,
removeProfileInOrganize,
setLogDataDiff,
checkExceptCommandType,
checkCommandType,
} from "../interfaces/utils";
import { Position } from "../entities/Position";
@ -2113,7 +2114,7 @@ export class CommandController extends Controller {
// ประวัติตำแหน่ง
const data = new ProfileSalary();
const meta = {
profileId: item.profileId,
profileId: profile.id,
date: item.date,
refCommandNo: item.refCommandNo,
templateDoc: item.salaryRef,
@ -2185,7 +2186,8 @@ export class CommandController extends Controller {
profile.lastUpdateUserId = req.user.sub;
profile.lastUpdateFullName = req.user.name;
profile.lastUpdatedAt = new Date();
if (item.isLeave == true) {
const exceptClear = await checkExceptCommandType(String(item.commandId));
if (item.isLeave == true && !exceptClear) {
await removeProfileInOrganize(profile.id, "OFFICER");
}
const clearProfile = await checkCommandType(String(item.commandId));