From b8bea7c8efa243524f4a7cd26b61ced74e5c6da8 Mon Sep 17 00:00:00 2001
From: mamoss <>
Date: Thu, 20 Mar 2025 18:44:41 +0700
Subject: [PATCH] search profilesalay temp

---
 .../ProfileSalaryTempController.ts            | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/controllers/ProfileSalaryTempController.ts b/src/controllers/ProfileSalaryTempController.ts
index 1f4900c2..224d314f 100644
--- a/src/controllers/ProfileSalaryTempController.ts
+++ b/src/controllers/ProfileSalaryTempController.ts
@@ -29,7 +29,7 @@ import { ProfileEmployee } from "../entities/ProfileEmployee";
 import permission from "../interfaces/permission";
 import { OrgRevision } from "../entities/OrgRevision";
 import Extension from "../interfaces/extension";
- @Route("api/v1/org/profile/salaryTemp")
+@Route("api/v1/org/profile/salaryTemp")
 @Tags("ProfileSalaryTemp")
 @Security("bearerAuth")
 export class ProfileSalaryTempController extends Controller {
@@ -87,7 +87,9 @@ export class ProfileSalaryTempController extends Controller {
           orgRevisionId: findRevision.id,
         })
         .andWhere(
-          statusCheckEdit != undefined && statusCheckEdit != null && statusCheckEdit.toUpperCase() != "ALL"
+          statusCheckEdit != undefined &&
+            statusCheckEdit != null &&
+            statusCheckEdit.toUpperCase() != "ALL"
             ? "profile.statusCheckEdit = :statusCheckEdit"
             : "1=1",
           {
@@ -273,7 +275,7 @@ export class ProfileSalaryTempController extends Controller {
             orgRevisionId: root == null ? null : root.orgRevisionId,
             org: `${_child4}${_child3}${_child2}${_child1}${root?.orgRootName ?? ""}`,
             statusCheckEdit: _data.statusCheckEdit,
-            type: "OFFICER"
+            type: "OFFICER",
           };
         }),
       );
@@ -310,7 +312,7 @@ export class ProfileSalaryTempController extends Controller {
         })
         .andWhere(
           statusCheckEdit != undefined && statusCheckEdit != null
-            ? "profile.statusCheckEdit = :statusCheckEdit"
+            ? "profileEmployee.statusCheckEdit = :statusCheckEdit"
             : "1=1",
           {
             statusCheckEdit: statusCheckEdit?.trim()?.toUpperCase() ?? null,
@@ -540,7 +542,7 @@ export class ProfileSalaryTempController extends Controller {
             child4ShortName: _data.child4ShortNameTemp ? _data.child4ShortNameTemp : null,
             org: `${_child4}${_child3}${_child2}${_child1}${root?.orgRootName ?? ""}`,
             statusCheckEdit: _data.statusCheckEdit,
-            type: "EMPLOYEE"
+            type: "EMPLOYEE",
           };
         }),
       );
@@ -614,18 +616,18 @@ export class ProfileSalaryTempController extends Controller {
    * @summary API Get ตำแหน่งเงินเดือน
    *
    */
-    @Get("get/{salaryId}")
-    public async getSalary(@Path() salaryId: string, @Request() req: RequestWithUser) {
-      const salary = await this.salaryRepo.findOne({
-        where: { id: salaryId },
-        relations: ["profileSalary"],
-      });
-      if (!salary) {
-        throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
-      }
-      return new HttpSuccess({ salaryNew: salary, salaryOld: salary.profileSalary });
+  @Get("get/{salaryId}")
+  public async getSalary(@Path() salaryId: string, @Request() req: RequestWithUser) {
+    const salary = await this.salaryRepo.findOne({
+      where: { id: salaryId },
+      relations: ["profileSalary"],
+    });
+    if (!salary) {
+      throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
     }
-    
+    return new HttpSuccess({ salaryNew: salary, salaryOld: salary.profileSalary });
+  }
+
   /**
    * API List ตำแหน่งเงินเดือน
    *
@@ -639,9 +641,9 @@ export class ProfileSalaryTempController extends Controller {
     @Request() req: RequestWithUser,
   ) {
     if (type.toLocaleUpperCase() == "OFFICER") {
-      const salary = await this.salaryRepo.find({ 
+      const salary = await this.salaryRepo.find({
         where: { profileId: profileId },
-        order: { order: "ASC" } 
+        order: { order: "ASC" },
       });
       if (salary.length <= 0) {
         let salaryOld = await this.salaryOldRepo.find({
@@ -671,9 +673,9 @@ export class ProfileSalaryTempController extends Controller {
       }
       return new HttpSuccess(salary);
     } else {
-      const salary = await this.salaryRepo.find({ 
+      const salary = await this.salaryRepo.find({
         where: { profileEmployeeId: profileId },
-        order: { order: "ASC" } 
+        order: { order: "ASC" },
       });
       if (salary.length <= 0) {
         let salaryOld = await this.salaryOldRepo.find({
@@ -751,8 +753,6 @@ export class ProfileSalaryTempController extends Controller {
     }
   }
 
-
-
   /**
    * API สร้างตำแหน่งเงินเดือน
    *