From e81ed7f778303995a192cba3f89e1db8047d6b03 Mon Sep 17 00:00:00 2001
From: mamoss <>
Date: Thu, 1 May 2025 13:35:54 +0700
Subject: [PATCH] kk1 employee

---
 src/controllers/ImportDataController.ts      |  8 ++-
 src/controllers/ProfileEmployeeController.ts | 58 ++++++++++----------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/controllers/ImportDataController.ts b/src/controllers/ImportDataController.ts
index a52cd4e4..e07e8d77 100644
--- a/src/controllers/ImportDataController.ts
+++ b/src/controllers/ImportDataController.ts
@@ -3410,7 +3410,9 @@ export class ImportDataController extends Controller {
   @Post("update-profileSalary")
   async UpdateProfileSalary(@Request() request: { user: Record<string, any> }) {
     let rowCount = 0;
-    const profileSalarys: any = await this.salaryRepo.find({ where: { refId: Not(IsNull()) } });
+    const profileSalarys: any = await this.salaryRepo.find({
+      where: { refId: Not(IsNull()), profileEmployeeId: IsNull(), posNumCodeSit: IsNull() },
+    });
 
     for await (const _item of profileSalarys) {
       const OFFICER = await this.HR_POSITION_OFFICERRepo.findOne({
@@ -3434,7 +3436,9 @@ export class ImportDataController extends Controller {
   @Post("update-profileSalaryEmp")
   async UpdateProfileSalaryEmp(@Request() request: { user: Record<string, any> }) {
     let rowCount = 0;
-    const profileSalarys: any = await this.salaryRepo.find({ where: { refId: Not(IsNull()) } });
+    const profileSalarys: any = await this.salaryRepo.find({
+      where: { refId: Not(IsNull()), profileId: IsNull(), posNumCodeSit: IsNull() },
+    });
 
     for await (const _item of profileSalarys) {
       const EMPLOYEE = await this.HR_POSITION_EMPLOYEERepo.findOne({
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index a92844db..b8887bc2 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -618,7 +618,7 @@ export class ProfileEmployeeController extends Controller {
               Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ??
               null,
             DisciplineDetail: item.detail ?? null,
-            RefNo: Extension.ToThaiNumber(item.refCommandNo) ?? null,
+            RefNo: item.refCommandNo ? Extension.ToThaiNumber(item.refCommandNo) : null,
           }))
         : [
             {
@@ -1630,7 +1630,7 @@ export class ProfileEmployeeController extends Controller {
           firstName: _data.firstName,
           lastName: _data.lastName,
           citizenId: _data.citizenId,
-          posLevel: `${_data.posType.posTypeShortName?? ""} ${_data.posLevel.posLevelName ?? ""}`,
+          posLevel: `${_data.posType.posTypeShortName ?? ""} ${_data.posLevel.posLevelName ?? ""}`,
           posType: _data.posType == null ? null : _data.posType.posTypeName,
           posLevelId: _data.posLevel == null ? null : _data.posLevel.id,
           posTypeId: _data.posType == null ? null : _data.posType.id,
@@ -2612,30 +2612,30 @@ export class ProfileEmployeeController extends Controller {
               keyword: `%${requestBody.keyword}%`,
             },
           )
-          .orWhere(
-            requestBody.keyword != null && requestBody.keyword != ""
-              ? "profileEmployee.firstName LIKE :keyword"
-              : "1=1",
-            {
-              keyword: `%${requestBody.keyword}%`,
-            },
-          )
-          .orWhere(
-            requestBody.keyword != null && requestBody.keyword != ""
-              ? "profileEmployee.lastName LIKE :keyword"
-              : "1=1",
-            {
-              keyword: `%${requestBody.keyword}%`,
-            },
-          )
-          .orWhere(
-            requestBody.keyword != null && requestBody.keyword != ""
-              ? "profileEmployee.citizenId LIKE :keyword"
-              : "1=1",
-            {
-              keyword: `%${requestBody.keyword}%`,
-            },
-          );
+            .orWhere(
+              requestBody.keyword != null && requestBody.keyword != ""
+                ? "profileEmployee.firstName LIKE :keyword"
+                : "1=1",
+              {
+                keyword: `%${requestBody.keyword}%`,
+              },
+            )
+            .orWhere(
+              requestBody.keyword != null && requestBody.keyword != ""
+                ? "profileEmployee.lastName LIKE :keyword"
+                : "1=1",
+              {
+                keyword: `%${requestBody.keyword}%`,
+              },
+            )
+            .orWhere(
+              requestBody.keyword != null && requestBody.keyword != ""
+                ? "profileEmployee.citizenId LIKE :keyword"
+                : "1=1",
+              {
+                keyword: `%${requestBody.keyword}%`,
+              },
+            );
         }),
       )
       .andWhere(
@@ -2663,8 +2663,8 @@ export class ProfileEmployeeController extends Controller {
                 .map((x) => x.current_holderId).length == 0
                 ? ["zxc"]
                 : orgRevision.employeePosMasters
-                  .filter((x) => x.current_holderId != null)
-                  .map((x) => x.current_holderId),
+                    .filter((x) => x.current_holderId != null)
+                    .map((x) => x.current_holderId),
           });
         }),
       )
@@ -2674,7 +2674,7 @@ export class ProfileEmployeeController extends Controller {
       .orderBy("posType.posTypeRank", "ASC")
       .addOrderBy("posLevel.posLevelRank", "ASC")
       .getManyAndCount();
-      
+
     const data = profiles.map((_data) => ({
       id: _data.id,
       prefix: _data.prefix,