From e3ae4babfe70da4df83edb7c061e050d6294d689 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 29 Apr 2025 14:03:17 +0700 Subject: [PATCH] fix report 500 --- src/controllers/CommandController.ts | 48 +++++++++---------- src/controllers/ProfileSalaryController.ts | 4 +- .../ProfileSalaryEmployeeController.ts | 4 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index b94506a0..b6af2bfd 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -2959,7 +2959,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -2973,7 +2973,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -3135,7 +3135,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -3149,7 +3149,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -3330,7 +3330,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -3344,7 +3344,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -3547,7 +3547,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -3561,7 +3561,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -3708,7 +3708,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -3722,7 +3722,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -4017,7 +4017,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -4031,7 +4031,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -4498,7 +4498,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -4512,7 +4512,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -4770,7 +4770,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -4784,7 +4784,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -4974,7 +4974,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -4988,7 +4988,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -5225,7 +5225,7 @@ export class CommandController extends Controller { where: { id: body.data.find(x => x.bodySalarys?.commandId)?.bodySalarys?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -5239,7 +5239,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -5730,7 +5730,7 @@ export class CommandController extends Controller { where: { id: body.refIds.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -5744,7 +5744,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } @@ -6280,7 +6280,7 @@ export class CommandController extends Controller { where: { id: body.refIds.find(x => x.commandId)?.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -6294,7 +6294,7 @@ export class CommandController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } diff --git a/src/controllers/ProfileSalaryController.ts b/src/controllers/ProfileSalaryController.ts index b73a1eda..79936bb1 100644 --- a/src/controllers/ProfileSalaryController.ts +++ b/src/controllers/ProfileSalaryController.ts @@ -681,7 +681,7 @@ export class ProfileSalaryController extends Controller { where: { id: body.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -695,7 +695,7 @@ export class ProfileSalaryController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." } diff --git a/src/controllers/ProfileSalaryEmployeeController.ts b/src/controllers/ProfileSalaryEmployeeController.ts index 71413455..ab172166 100644 --- a/src/controllers/ProfileSalaryEmployeeController.ts +++ b/src/controllers/ProfileSalaryEmployeeController.ts @@ -365,7 +365,7 @@ export class ProfileSalaryEmployeeController extends Controller { where: { id: body.commandId ?? "" } }); if (_command) { - if (_command?.isBangkok.toLocaleUpperCase() == "OFFICE") { + if (_command?.isBangkok?.toLocaleUpperCase() == "OFFICE") { const orgRootDeputy = await this.orgRootRepository.findOne({ where: { isDeputy: true, @@ -379,7 +379,7 @@ export class ProfileSalaryEmployeeController extends Controller { _posNumCodeSit = orgRootDeputy ? orgRootDeputy?.orgRootName : "สำนักปลัดกรุงเทพมหานคร"; _posNumCodeSitAbb = orgRootDeputy ? orgRootDeputy?.orgRootShortName : "สนป."; } - else if (_command?.isBangkok.toLocaleUpperCase() == "BANGKOK") { + else if (_command?.isBangkok?.toLocaleUpperCase() == "BANGKOK") { _posNumCodeSit = "กรุงเทพมหานคร" _posNumCodeSitAbb = "กทม." }