From 56fa762139381cd85a1aab9c8f109416fe4ee17d Mon Sep 17 00:00:00 2001
From: kittapath <kittapath@frappet.com>
Date: Tue, 26 Nov 2024 15:18:00 +0700
Subject: [PATCH] no message

---
 src/controllers/PositionController.ts | 45 +++++++++++++--------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 6ff78f92..251c65e0 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -567,9 +567,9 @@ export class PositionController extends Controller {
         findPosDict = await this.posDictRepository.find({
           where: { posDictName: Like(`%${keyword}%`) },
           relations: ["posType", "posLevel", "posExecutive"],
-          order: { 
+          order: {
             posDictName: "ASC",
-            createdAt: "DESC"
+            createdAt: "DESC",
           },
         });
         break;
@@ -578,9 +578,9 @@ export class PositionController extends Controller {
         findPosDict = await this.posDictRepository.find({
           where: { posDictField: Like(`%${keyword}%`) },
           relations: ["posType", "posLevel", "posExecutive"],
-          order: { 
+          order: {
             posDictField: "ASC",
-            createdAt: "DESC" 
+            createdAt: "DESC",
           },
         });
         break;
@@ -594,9 +594,9 @@ export class PositionController extends Controller {
         findPosDict = await this.posDictRepository.find({
           where: { posTypeId: In(findTypes.map((x) => x.id)) },
           relations: ["posType", "posLevel", "posExecutive"],
-          order: { 
+          order: {
             posDictName: "ASC",
-            createdAt: "DESC" 
+            createdAt: "DESC",
           },
         });
         break;
@@ -610,9 +610,9 @@ export class PositionController extends Controller {
         findPosDict = await this.posDictRepository.find({
           where: { posLevelId: In(findLevel.map((x) => x.id)) },
           relations: ["posType", "posLevel", "posExecutive"],
-          order: { 
+          order: {
             posDictName: "ASC",
-            createdAt: "DESC" 
+            createdAt: "DESC",
           },
         });
         break;
@@ -626,9 +626,9 @@ export class PositionController extends Controller {
         findPosDict = await this.posDictRepository.find({
           where: { posExecutiveId: In(findExecutive.map((x) => x.id)) },
           relations: ["posType", "posLevel", "posExecutive"],
-          order: { 
+          order: {
             posDictName: "ASC",
-            createdAt: "DESC" 
+            createdAt: "DESC",
           },
         });
         break;
@@ -637,9 +637,9 @@ export class PositionController extends Controller {
         findPosDict = await this.posDictRepository.find({
           where: { posDictExecutiveField: Like(`%${keyword}%`) },
           relations: ["posType", "posLevel", "posExecutive"],
-          order: { 
+          order: {
             posDictName: "ASC",
-            createdAt: "DESC" 
+            createdAt: "DESC",
           },
         });
         break;
@@ -648,9 +648,9 @@ export class PositionController extends Controller {
         findPosDict = await this.posDictRepository.find({
           where: { posDictArea: Like(`%${keyword}%`) },
           relations: ["posType", "posLevel", "posExecutive"],
-          order: { 
+          order: {
             posDictName: "ASC",
-            createdAt: "DESC" 
+            createdAt: "DESC",
           },
         });
         break;
@@ -685,9 +685,9 @@ export class PositionController extends Controller {
             { posDictArea: Like(`%${keyword}%`) },
           ],
           relations: ["posType", "posLevel", "posExecutive"],
-          order: { 
+          order: {
             posDictName: "ASC",
-            createdAt: "DESC" 
+            createdAt: "DESC",
           },
         });
         break;
@@ -695,9 +695,9 @@ export class PositionController extends Controller {
       default:
         findPosDict = await this.posDictRepository.find({
           relations: ["posType", "posLevel", "posExecutive"],
-          order: { 
+          order: {
             posDictName: "ASC",
-            createdAt: "DESC" 
+            createdAt: "DESC",
           },
         });
         break;
@@ -1336,7 +1336,7 @@ export class PositionController extends Controller {
     let typeCondition: any = {};
     let checkChildConditions: any = {};
     let keywordAsInt: any;
-    let searchShortName = "";
+    let searchShortName = "1=1";
     let searchShortName0 = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
     let searchShortName1 = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
     let searchShortName2 = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
@@ -1596,7 +1596,7 @@ export class PositionController extends Controller {
     //   let _authRole:any;
     //   let _masterIdRole:any
     //   _authRole = await this.authRoleRepo.find({
-    //     where: { 
+    //     where: {
     //       roleName: Like(`%${body.keyword}%`),
     //     },
     //     relations: ["posMasters"]
@@ -1795,8 +1795,7 @@ export class PositionController extends Controller {
     let typeCondition: any = {};
     let checkChildConditions: any = {};
     let keywordAsInt: any;
-    let searchShortName = "";
-    let labelName = "";
+    let searchShortName = "1=1";
     let searchShortName0 = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
     let searchShortName1 = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
     let searchShortName2 = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
@@ -4683,7 +4682,7 @@ export class PositionController extends Controller {
     let typeCondition: any = {};
     let checkChildConditions: any = {};
     let keywordAsInt: any;
-    let searchShortName = "";
+    let searchShortName = "1=1";
     let searchShortName0 = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
     let searchShortName1 = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
     let searchShortName2 = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;