Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

This commit is contained in:
kittapath 2024-10-10 13:52:46 +07:00
commit 729f322bf1

View file

@ -2232,8 +2232,8 @@ export class CommandController extends Controller {
Object.assign(profileSal, { ...item.bodySalarys, ...meta });
const salaryHistory = new ProfileSalaryHistory();
Object.assign(salaryHistory, { ...profileSal, id: undefined });
(profileSal.order = dest_item == null ? 1 : dest_item.order + 1),
(profileSal.profileId = profile.id);
profileSal.order = dest_item == null ? 1 : dest_item.order + 1
profileSal.profileId = profile.id;
await this.salaryRepo.save(profileSal, { data: req });
setLogDataDiff(req, { before, after: profileSal });
salaryHistory.profileSalaryId = profileSal.id;