Merge branch 'develop' into adiDev

src/controllers/ProfileSalaryEmployeeController.ts

@@ -67,7 +67,7 @@ export class ProfileSalaryEmployeeController extends Controller {
     }
 
     const dest_item = await this.salaryRepo.findOne({
-      where: { profileId: body.profileEmployeeId },
+      where: { profileEmployeeId: body.profileEmployeeId },
       order: { order: "DESC" },
     });
 

src/entities/ProfileSalary.ts

@@ -148,6 +148,10 @@ export class ProfileSalary extends EntityBase {
   @ManyToOne(() => Profile, (profile) => profile.profileSalary)
   @JoinColumn({ name: "profileId" })
   profile: Profile;
+
+  @ManyToOne(() => ProfileEmployee, (ProfileEmployee) => ProfileEmployee.profileSalarys)
+  @JoinColumn({ name: "profileEmployeeId" })
+  profileEmployee: ProfileEmployee;
 }
 
 export class CreateProfileSalary {