From ab9c8a34eb28f124f0eca56876860987e166ee6a Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 26 Dec 2024 20:09:39 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20image?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 4 ++-- src/controllers/ProfileEmployeeController.ts | 9 +++++---- src/controllers/ProfileEmployeeTempController.ts | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 11c4fc53..9e7a5452 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -317,7 +317,7 @@ export class ProfileController extends Controller { ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`, educations: Education, salarys: salarys, - url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`, + url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_MGT}/assets/avatar_user-89f22423.jpg`, }; return new HttpSuccess({ @@ -754,7 +754,7 @@ export class ProfileController extends Controller { : "", telephone: profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "", - url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`, + url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_MGT}/assets/avatar_user-89f22423.jpg`, url1: _ImgUrl[0] ? _ImgUrl[0] : null, yearUpload1: profiles.profileAvatars[0] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt)) diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 02cf1e6e..b2cde0df 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -284,7 +284,7 @@ export class ProfileEmployeeController extends Controller { : "-", ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`, educations: Education, - url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`, + url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_MGT}/assets/avatar_user-89f22423.jpg`, }; return new HttpSuccess({ @@ -722,7 +722,7 @@ export class ProfileEmployeeController extends Controller { : "", telephone: profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "", - url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`, + url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_MGT}/assets/avatar_user-89f22423.jpg`, url1: _ImgUrl[0] ? _ImgUrl[0] : null, yearUpload1: profiles.profileAvatars[0] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt)) @@ -2153,9 +2153,10 @@ export class ProfileEmployeeController extends Controller { nodeId: null, salary: profile ? profile.amount : null, amountSpecial: profile ? profile.amountSpecial : null, - posNo : root?.orgRootShortName && posMaster?.posMasterNo + posNo: + root?.orgRootShortName && posMaster?.posMasterNo ? `${root?.orgRootShortName}${posMaster?.posMasterNo}` - : "" + : "", }; return new HttpSuccess(_profile); } diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts index 293e1a14..c46b94de 100644 --- a/src/controllers/ProfileEmployeeTempController.ts +++ b/src/controllers/ProfileEmployeeTempController.ts @@ -281,7 +281,7 @@ export class ProfileEmployeeTempController extends Controller { : "-", ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`, educations: Education, - url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`, + url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_MGT}/assets/avatar_user-89f22423.jpg`, }; return new HttpSuccess({ @@ -719,7 +719,7 @@ export class ProfileEmployeeTempController extends Controller { : "", telephone: profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "", - url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`, + url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_MGT}/assets/avatar_user-89f22423.jpg`, url1: _ImgUrl[0] ? _ImgUrl[0] : null, yearUpload1: profiles.profileAvatars[0] ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt))