From a3d501f7d449197f06fe12ad275b2572cc7c060a Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 24 Apr 2024 14:56:20 +0700 Subject: [PATCH 1/4] fix positionIsSelect --- src/controllers/PositionController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index 773e7799..61649806 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -1021,7 +1021,7 @@ export class PositionController extends Controller { position.positionExecutiveField = x.posDictExecutiveField; position.positionArea = x.posDictArea; position.isSpecial = x.isSpecial; - position.positionIsSelected = false; + position.positionIsSelected = x.positionIsSelected; position.posMasterId = posMaster.id; position.createdUserId = request.user.sub; position.createdFullName = request.user.name; From 7f53c577b28bf32a864c9008865549ee9f3bbf44 Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 24 Apr 2024 15:35:12 +0700 Subject: [PATCH 2/4] fix positionIsSelect --- src/entities/PosDict.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/entities/PosDict.ts b/src/entities/PosDict.ts index 9de18e35..3439c2ac 100644 --- a/src/entities/PosDict.ts +++ b/src/entities/PosDict.ts @@ -101,6 +101,9 @@ export class CreatePosDict { @Column() isSpecial: boolean; + + @Column() + positionIsSelected: boolean | null; } export class CreatePosDictExe { From 8689e36292c3ce6110c6652fe551ac5ee53dd198 Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 24 Apr 2024 15:42:59 +0700 Subject: [PATCH 3/4] fix positionIsSelect --- src/entities/PosDict.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/entities/PosDict.ts b/src/entities/PosDict.ts index 3439c2ac..5488dd2c 100644 --- a/src/entities/PosDict.ts +++ b/src/entities/PosDict.ts @@ -103,7 +103,7 @@ export class CreatePosDict { isSpecial: boolean; @Column() - positionIsSelected: boolean | null; + positionIsSelected?: boolean | null; } export class CreatePosDictExe { From 1f88eb40852711127c578f72265e229cdf4df212 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Wed, 24 Apr 2024 17:45:00 +0700 Subject: [PATCH 4/4] fix test --- src/controllers/PositionController.ts | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index 773e7799..d2ca384e 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -701,6 +701,15 @@ export class PositionController extends Controller { ); } + let fullPosMasterNo = String((requestBody.posMasterNoPrefix).trim() + (requestBody.posMasterNo) + (requestBody.posMasterNoSuffix).trim()); + if (fullPosMasterNo === String(requestBody.posMasterNo)) { + throw new HttpError( + HttpStatusCode.INTERNAL_SERVER_ERROR, + "ไม่สามารถใส่ข้อมูลซ้ำกันได้", + ); + } + + posMaster.createdUserId = request.user.sub; posMaster.createdFullName = request.user.name; posMaster.lastUpdateUserId = request.user.sub; @@ -769,6 +778,7 @@ export class PositionController extends Controller { if (!posMaster) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลอัตรากำลัง"); } + posMaster.posMasterNo = requestBody.posMasterNo; posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix; posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix; @@ -918,7 +928,14 @@ export class PositionController extends Controller { ); } } - + + let fullPosMasterNo = String((requestBody.posMasterNoPrefix).trim() + (requestBody.posMasterNo) + (requestBody.posMasterNoSuffix).trim()); + if (fullPosMasterNo === String(requestBody.posMasterNo)) { + throw new HttpError( + HttpStatusCode.INTERNAL_SERVER_ERROR, + "ไม่สามารถเพิ่มข้อมูลชื่อตำแหน่งซ้ำกันได้", + ); + } // const chk_SName0 = await this.posMasterRepository.findOne({ // where: { // orgRevisionId: posMaster.orgRevisionId, @@ -1167,7 +1184,7 @@ export class PositionController extends Controller { orgChild3Id: body.id, }; if (!body.isAll) { - checkChildConditions = { + checkChildConditions = { orgChild4Id: IsNull(), }; searchShortName = `CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;