เลื่อนเงินเดือนลูกจ้าง

src/controllers/SalaryRankController.ts

@@ -14,7 +14,7 @@ import {
   Get,
   Query,
 } from "tsoa";
-import { Like} from "typeorm";
+import { Like } from "typeorm";
 import { AppDataSource } from "../database/data-source";
 import HttpSuccess from "../interfaces/http-success";
 import HttpStatusCode from "../interfaces/http-status";
@@ -126,12 +126,11 @@ export class SalaryRanksController extends Controller {
     if (keyword != undefined && keyword !== "") {
       whereClause = {
         where: [
-          { salaryId: id }, 
-          { salary: Like(`%${keyword}%`) }, 
+          { salary: Like(`%${keyword}%`) },
           { salaryHalf: Like(`%${keyword}%`) },
-          { salaryHalfSpecial: Like(`%${keyword}%`) }, 
+          { salaryHalfSpecial: Like(`%${keyword}%`) },
           { salaryFull: Like(`%${keyword}%`) },
-          { salaryFullSpecial: Like(`%${keyword}%`) }, 
+          { salaryFullSpecial: Like(`%${keyword}%`) },
           { salaryFullHalf: Like(`%${keyword}%`) },
           { salaryFullHalfSpecial: Like(`%${keyword}%`) },
         ],
@@ -139,6 +138,9 @@ export class SalaryRanksController extends Controller {
     }
     const [salaryRank, total] = await this.salaryRankRepository.findAndCount({
       ...whereClause,
+      where: {
+        salaryId: id,
+      },
       select: [
         "id",
         "salary",