From 9045ec339c251d623503c9c39aab1e09564fc723 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 13 Feb 2024 18:27:03 +0700
Subject: [PATCH] fix order

---
 src/controllers/PositionController.ts | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 02829078..4f2445a7 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -339,10 +339,10 @@ export class PositionController extends Controller {
                 where: {
                   orgChild4Id: orgChild4.id,
                 },
-                order: { posMasterNo: "DESC" },
+                order: { posMasterOrder: "DESC" },
               });
-              posMaster.posMasterOrder =
-                order.posMasterOrder == null ? 1 : order.posMasterOrder + 1;
+              console.log("111111111");
+              posMaster.posMasterOrder = order !== null && order !== undefined && order.posMasterOrder ? order.posMasterOrder + 1 : 1;
               posMaster.orgRootId = orgChild4.orgRootId;
               posMaster.orgChild1Id = orgChild4.orgChild1Id;
               posMaster.orgChild2Id = orgChild4.orgChild2Id;
@@ -356,9 +356,10 @@ export class PositionController extends Controller {
                 orgChild3Id: orgChild3.id,
                 orgChild4Id: IsNull() || "",
               },
-              order: { posMasterNo: "DESC" },
+              order: { posMasterOrder: "DESC" },
             });
-            posMaster.posMasterOrder = order.posMasterOrder == null ? 1 : order.posMasterOrder + 1;
+            console.log("22222222");
+            posMaster.posMasterOrder = order !== null && order !== undefined && order.posMasterOrder ? order.posMasterOrder + 1 : 1;
             posMaster.orgRootId = orgChild3.orgRootId;
             posMaster.orgChild1Id = orgChild3.orgChild1Id;
             posMaster.orgChild2Id = orgChild3.orgChild2Id;
@@ -372,9 +373,10 @@ export class PositionController extends Controller {
               orgChild3Id: IsNull() || "",
               orgChild4Id: IsNull() || "",
             },
-            order: { posMasterNo: "DESC" },
+            order: { posMasterOrder: "DESC" },
           });
-          posMaster.posMasterOrder = order.posMasterOrder == null ? 1 : order.posMasterOrder + 1;
+          console.log("333333333");
+          posMaster.posMasterOrder = order !== null && order !== undefined && order.posMasterOrder ? order.posMasterOrder + 1 : 1;
           posMaster.orgRootId = orgChild2.orgRootId;
           posMaster.orgChild1Id = orgChild2.orgChild1Id;
           posMaster.orgChild2Id = orgChild2.id;
@@ -388,9 +390,10 @@ export class PositionController extends Controller {
             orgChild3Id: IsNull() || "",
             orgChild4Id: IsNull() || "",
           },
-          order: { posMasterNo: "DESC" },
+          order: { posMasterOrder: "DESC" },
         });
-        posMaster.posMasterOrder = order.posMasterOrder == null ? 1 : order.posMasterOrder + 1;
+        console.log("444444444");
+        posMaster.posMasterOrder = order !== null && order !== undefined && order.posMasterOrder ? order.posMasterOrder + 1 : 1;
         posMaster.orgRootId = orgChild1.orgRootId;
         posMaster.orgChild1Id = orgChild1.id;
         posMaster.orgRevisionId = orgChild1.orgRevisionId;
@@ -404,9 +407,10 @@ export class PositionController extends Controller {
           orgChild3Id: IsNull() || "",
           orgChild4Id: IsNull() || "",
         },
-        order: { posMasterNo: "DESC" },
+        order: { posMasterOrder: "DESC" },
       });
-      posMaster.posMasterOrder = order.posMasterOrder == null ? 1 : order.posMasterOrder + 1;
+      console.log("55555555:"+order);
+      posMaster.posMasterOrder = order !== null && order !== undefined && order.posMasterOrder ? order.posMasterOrder + 1 : 1;
       posMaster.orgRootId = orgRoot.id;
       posMaster.orgRevisionId = orgRoot.orgRevisionId;
     }