diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index e4cec3e6..e9d035bf 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/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.posMasterNoSuffix = requestBody.posMasterNoSuffix; + posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix ?? _null; + posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix ?? _null; posMaster.reason = requestBody.reason == null ? "" : requestBody.reason; posMaster.orgRootId = null; posMaster.orgChild1Id = null; diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index d7ad85fe..d608bbbc 100644 --- a/src/controllers/PositionController.ts +++ b/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.posMasterNoSuffix = requestBody.posMasterNoSuffix; + posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix ?? _null; + posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix ?? _null; posMaster.reason = requestBody.reason == null ? "" : requestBody.reason; let orgRoot: any = null; diff --git a/src/entities/EmployeePosMaster.ts b/src/entities/EmployeePosMaster.ts index ed79835f..c1f0e143 100644 --- a/src/entities/EmployeePosMaster.ts +++ b/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[]; diff --git a/src/entities/PosMaster.ts b/src/entities/PosMaster.ts index 938067e9..59018baa 100644 --- a/src/entities/PosMaster.ts +++ b/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[];