Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
This commit is contained in:
commit
ef8b598f7a
1 changed files with 3 additions and 1 deletions
|
|
@ -4274,7 +4274,7 @@ export class CommandController extends Controller {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
relations: ["current_holders","roleKeycloaks"],
|
relations: ["current_holders","current_holders.orgRevision","roleKeycloaks"],
|
||||||
});
|
});
|
||||||
if (!profile) {
|
if (!profile) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทะเบียนประวัตินี้");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทะเบียนประวัตินี้");
|
||||||
|
|
@ -4318,7 +4318,9 @@ export class CommandController extends Controller {
|
||||||
lastUpdatedAt: new Date(),
|
lastUpdatedAt: new Date(),
|
||||||
};
|
};
|
||||||
if (item.isLeave != undefined && item.isLeave == true) {
|
if (item.isLeave != undefined && item.isLeave == true) {
|
||||||
|
console.log("profile.current_holders.id>>>",profile.current_holders.id);
|
||||||
await CreatePosMasterHistoryOfficer(profile.current_holders.id, req, "DELETE");
|
await CreatePosMasterHistoryOfficer(profile.current_holders.id, req, "DELETE");
|
||||||
|
console.log("profile.id>>>",profile.id);
|
||||||
await removeProfileInOrganize(profile.id, "OFFICER");
|
await removeProfileInOrganize(profile.id, "OFFICER");
|
||||||
}
|
}
|
||||||
const clearProfile = await checkCommandType(String(item.commandId));
|
const clearProfile = await checkCommandType(String(item.commandId));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue