fix #699 แนบท้ายไม่แสดง

This commit is contained in:
Bright 2024-10-28 14:46:55 +07:00
parent 5e361e375b
commit 58ea6f67c1

View file

@ -2830,7 +2830,20 @@ export class CommandController extends Controller {
@Request() req: RequestWithUser, @Request() req: RequestWithUser,
@Body() @Body()
body: { body: {
refIds: string[]; refIds: {
refId?: string;
Sequence?: number;
CitizenId?: string;
Prefix?: string;
FirstName?: string;
LastName?: string;
Amount?: number;
PositionSalaryAmount?: number;
MouthSalaryAmount?: number;
RemarkHorizontal?: string;
RemarkVertical?: string;
CommandYear?: number;
}[];
}, },
) { ) {
let data: any = []; let data: any = [];
@ -2857,7 +2870,7 @@ export class CommandController extends Controller {
"posMasterChild.current_holder.posType", "posMasterChild.current_holder.posType",
], ],
where: { where: {
id: item, id: item.refId,
}, },
}); });
if (!posMasterAct) { if (!posMasterAct) {
@ -2893,13 +2906,13 @@ export class CommandController extends Controller {
"" + posMasterAct.posMasterChild?.current_holder?.firstName ?? "" + posMasterAct.posMasterChild?.current_holder?.firstName ??
"" + " " + posMasterAct.posMasterChild?.current_holder?.lastName ?? "" + " " + posMasterAct.posMasterChild?.current_holder?.lastName ??
null, null,
oc: (posMasterAct.posMasterChild?.current_holder?.position ?? null) + "/" + _organization, oc: (posMasterAct.posMasterChild?.current_holder?.position ?? "-") + "/" + (_organization ?? "-"),
postype: posMasterAct.posMasterChild?.current_holder?.posType?.posTypeName ?? null, postype: posMasterAct.posMasterChild?.current_holder?.posType?.posTypeName ?? "-",
poslevel: posMasterAct.posMasterChild?.current_holder?.posLevel?.posLevelName ?? null, poslevel: posMasterAct.posMasterChild?.current_holder?.posLevel?.posLevelName ?? "-",
organizationNew: _organizationNew, organizationNew: _organizationNew ?? "-",
// date: Extension.ToThaiShortDate_noPrefix(new Date()), // date: Extension.ToThaiShortDate_noPrefix(new Date()),
dateStart: "", dateStart: "-",
dateEnd: "", dateEnd: "-",
order: order:
posMasterAct.posMasterOrder == null posMasterAct.posMasterOrder == null
? "-" ? "-"