Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

src/controllers/EmployeePositionController.ts

@@ -700,8 +700,8 @@ export class EmployeePositionController extends Controller {
     // posMaster.isStaff = requestBody.isStaff == null?_null:requestBody.isStaff;
     // posMaster.positionSign = requestBody.positionSign == null ? _null : requestBody.positionSign;
     // posMaster.isOfficer = requestBody.isOfficer;
-    posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix;
+    posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix ?? _null;
-    posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix;
+    posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix ?? _null;
     posMaster.reason = requestBody.reason == null ? "" : requestBody.reason;
     posMaster.orgRootId = null;
     posMaster.orgChild1Id = null;
@@ -1233,6 +1233,7 @@ export class EmployeePositionController extends Controller {
 
         return {
           id: posMaster.id,
+          current_holderId: posMaster.current_holderId,
           orgRootId: posMaster.orgRootId,
           orgChild1Id: posMaster.orgChild1Id,
           orgChild2Id: posMaster.orgChild2Id,

src/controllers/EmployeeTempPositionController.ts

@@ -997,6 +997,7 @@ export class EmployeeTempPositionController extends Controller {
 
         return {
           id: posMaster.id,
+          current_holderId: posMaster.current_holderId,
           orgRootId: posMaster.orgRootId,
           orgChild1Id: posMaster.orgChild1Id,
           orgChild2Id: posMaster.orgChild2Id,

src/controllers/PositionController.ts

@@ -1250,8 +1250,8 @@ export class PositionController extends Controller {
         ? _null
         : requestBody.positionSign;
     posMaster.posMasterNo = requestBody.posMasterNo;
-    posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix;
+    posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix ?? _null;
-    posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix;
+    posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix ?? _null;
     posMaster.reason = requestBody.reason == null ? "" : requestBody.reason;
 
     let orgRoot: any = null;
@@ -1913,6 +1913,7 @@ export class PositionController extends Controller {
 
         return {
           id: posMaster.id,
+          current_holderId: posMaster.current_holderId,
           isDirector: posMaster.isDirector,
           orgRootId: posMaster.orgRootId,
           orgChild1Id: posMaster.orgChild1Id,
@@ -2342,6 +2343,7 @@ export class PositionController extends Controller {
 
         return {
           id: posMaster.id,
+          current_holderId: posMaster.current_holderId,
           isDirector: posMaster.isDirector,
           orgRootId: posMaster.orgRootId,
           orgChild1Id: posMaster.orgChild1Id,

src/entities/EmployeePosMaster.ts

@@ -235,13 +235,13 @@ export class EmployeePosMaster extends EntityBase {
 
 export class CreateEmployeePosMaster {
   @Column()
-  posMasterNoPrefix: string;
+  posMasterNoPrefix: string | null;
 
   @Column()
   posMasterNo: number;
 
   @Column()
-  posMasterNoSuffix: string;
+  posMasterNoSuffix: string | null;
 
   @Column("uuid")
   positions: CreateEmployeePosDict[];

src/entities/PosMaster.ts

@@ -267,13 +267,13 @@ export class PosMaster extends EntityBase {
 
 export class CreatePosMaster {
   @Column()
-  posMasterNoPrefix: string;
+  posMasterNoPrefix: string | null;
 
   @Column()
   posMasterNo: number;
 
   @Column()
-  posMasterNoSuffix: string;
+  posMasterNoSuffix: string | null;
 
   @Column("uuid")
   positions: CreatePosDict[];