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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-12-24 13:55:13 +07:00
commit 27137aad68
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/controllers/ProfileController.ts
View file

@ -1967,7 +1967,7 @@ export class ProfileController extends Controller {
process.env.AUTH_ACCOUNT_SECRET, process.env.AUTH_ACCOUNT_SECRET,
{ expiresIn: "15m" }, { expiresIn: "15m" },
); );
const link = process.env.URL + "/verifyemail?upn=" + token; const link = process.env.VITE_URL_USER + "/verifyemail?upn=" + token;
await new CallAPI() await new CallAPI()
.PostData(req, "/placement/noti/send-mail", { .PostData(req, "/placement/noti/send-mail", {
@ -4136,7 +4136,14 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("current_holders.orgChild2", "orgChild2") .leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3") .leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.where("current_holders.orgRevisionId = :orgRevisionId", { orgRevisionId: findRevision.id }) .where(
node && nodeId
? "current_holders.orgRevisionId = :orgRevisionId"
: "1=1",
{
orgRevisionId: node && nodeId ? findRevision.id : undefined,
}
)
.andWhere( .andWhere(
_data.root != undefined && _data.root != null _data.root != undefined && _data.root != null
? _data.root[0] != null ? _data.root[0] != null
@ -4863,7 +4870,7 @@ export class ProfileController extends Controller {
node: null, node: null,
nodeId: null, nodeId: null,
salary: profile ? profile.amount : null, salary: profile ? profile.amount : null,
amountSpecial: profile ? profile.amountSpecial : null amountSpecial: profile ? profile.amountSpecial : null,
}; };
if (_profile.child4Id != null) { if (_profile.child4Id != null) {

9
src/controllers/ProfileEmployeeController.ts
View file

@ -1454,7 +1454,14 @@ export class ProfileEmployeeController extends Controller {
.leftJoinAndSelect("current_holders.orgChild2", "orgChild2") .leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3") .leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.where("current_holders.orgRevisionId = :orgRevisionId", { orgRevisionId: findRevision.id }) .where(
node && nodeId
? "current_holders.orgRevisionId = :orgRevisionId"
: "1=1",
{
orgRevisionId: node && nodeId ? findRevision.id : undefined,
}
)
.andWhere( .andWhere(
_data.root != undefined && _data.root != null _data.root != undefined && _data.root != null
? _data.root[0] != null ? _data.root[0] != null