diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 81b4da5c..f4c643b8 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -667,9 +667,9 @@ export class CommandController extends Controller { */ @Delete("tab2Cancel17/{refId}") async DeleteTab2Cancel17(@Path() refId: string, @Request() request: RequestWithUser) { - await new permission().PermissionUpdate(request, "COMMAND"); + // await new permission().PermissionUpdate(request, "COMMAND"); const commandRecive = await this.commandReciveRepository.findOne({ - where: { refId: refId, command: { commandType: { commandCode: "C-PM-17" } } }, + where: { refId: refId, command: { commandType: { code: "C-PM-17" } } }, relations: ["command", "command.commandType"], }); if (!commandRecive) { @@ -711,9 +711,9 @@ export class CommandController extends Controller { */ @Delete("tab2Cancel23/{refId}") async DeleteTab2Cancel23(@Path() refId: string, @Request() request: RequestWithUser) { - await new permission().PermissionUpdate(request, "COMMAND"); + // await new permission().PermissionUpdate(request, "COMMAND"); const commandRecive = await this.commandReciveRepository.findOne({ - where: { refId: refId, command: { commandType: { commandCode: "C-PM-23" } } }, + where: { refId: refId, command: { commandType: { code: "C-PM-23" } } }, relations: ["command", "command.commandType"], }); if (!commandRecive) { diff --git a/src/controllers/ImportDataController.ts b/src/controllers/ImportDataController.ts index 42a699c6..8f953df6 100644 --- a/src/controllers/ImportDataController.ts +++ b/src/controllers/ImportDataController.ts @@ -2530,7 +2530,7 @@ export class ImportDataController extends Controller { .toISOString() .replace("T", " ") .substring(0, 19); - profileSalary.remark = item.SalaryRef + item.PositionName; + profileSalary.remark = `${item.SalaryRef} ${item.PositionName}`; profileSalary.amount = item.Amount; profileSalary.positionSalaryAmount = item.PositionSalaryAmount; // const str = item.PosNoName;