Merge branch 'develop' into adiDev

This commit is contained in:
AdisakKanthawilang 2024-11-12 17:52:25 +07:00
commit 9f48e5df1d
2 changed files with 8 additions and 6 deletions

View file

@ -3520,8 +3520,9 @@ export class CommandController extends Controller {
@Request() req: RequestWithUser,
@Body()
body: {
refIds: {
refId: string;
refIds: string[];
// refIds: {
// refId: string;
// commandAffectDate: Date | null;
// commandNo: string | null;
// commandYear: number;
@ -3529,11 +3530,11 @@ export class CommandController extends Controller {
// amount: Double | null;
// positionSalaryAmount: Double | null;
// mouthSalaryAmount: Double | null;
}[];
// }[];
},
) {
const posMasters = await this.posMasterRepository.find({
where: { id: In(body.refIds.map((x) => x.refId)) },
where: { id: In(body.refIds/*.map((x) => x.refId)*/) },
});
const data = posMasters.map((_data) => ({
..._data,

View file

@ -7897,15 +7897,16 @@ export class ProfileController extends Controller {
},
},
});
profileNoti.map((x) => ({
let _profileNoti = profileNoti.map((x) => ({
receiverUserId: x.id,
notiLink: "",
}));
console.log(profileNoti);
await new CallAPI()
.PostData(req, "/placement/noti/profiles", {
subject: body.subject,
body: body.body,
receiverUserIds: profileNoti,
receiverUserIds: _profileNoti,
payload: "", //แนบไฟล์
isSendMail: true,
isSendInbox: true,