Fix เพิ่มข้อมูลคู่สมรสแล้วไม่แสดง #1637, #1645

src/controllers/ProfileFamilyCoupleController.ts

@@ -170,6 +170,10 @@ export class ProfileFamilyCoupleController extends Controller {
       throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
     }
     await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_OFFICER", profile.id);
+    await this.ProfileFamilyCouple.update(
+      { profileId: profile.id },
+      { couple: false },
+    );
     const before = null;
     familyCouple.coupleCitizenId = Extension.CheckCitizen(String(body.coupleCitizenId));
     familyCouple.createdUserId = req.user.sub;
@@ -178,7 +182,7 @@ export class ProfileFamilyCoupleController extends Controller {
     familyCouple.lastUpdateFullName = req.user.name;
     familyCouple.createdAt = new Date();
     familyCouple.lastUpdatedAt = new Date();
-
+    familyCouple.couple = true;
     profile.relationship = familyCouple.relationship; //update profileEmployee.relationship
     const history = new ProfileFamilyCoupleHistory();
     Object.assign(history, { ...familyCouple, id: undefined });

src/controllers/ProfileFamilyCoupleEmployeeController.ts

@@ -161,6 +161,10 @@ export class ProfileFamilyCoupleEmployeeController extends Controller {
       throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
     }
     await new permission().PermissionOrgUserUpdate(req, "SYS_REGISTRY_EMP", profile.id);
+    await this.ProfileFamilyCouple.update(
+      { profileEmployeeId: profile.id },
+      { couple: false },
+    );
     const before = null;
     familyCouple.coupleCitizenId = Extension.CheckCitizen(String(body.coupleCitizenId));
     familyCouple.createdUserId = req.user.sub;
@@ -169,7 +173,7 @@ export class ProfileFamilyCoupleEmployeeController extends Controller {
     familyCouple.lastUpdateFullName = req.user.name;
     familyCouple.createdAt = new Date();
     familyCouple.lastUpdatedAt = new Date();
-
+    familyCouple.couple = true;
     profile.relationship = familyCouple.relationship; //update profileEmployee.relationship
     const history = new ProfileFamilyCoupleHistory();
     Object.assign(history, { ...familyCouple, id: undefined });

src/controllers/ProfileFamilyCoupleEmployeeTempController.ts

@@ -161,6 +161,10 @@ export class ProfileFamilyCoupleEmployeeTempController extends Controller {
     if (!profile) {
       throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
     }
+    await this.ProfileFamilyCouple.update(
+      { profileEmployeeId: profile.id },
+      { couple: false },
+    );
     familyCouple.coupleCitizenId = Extension.CheckCitizen(String(body.coupleCitizenId));
     familyCouple.createdUserId = req.user.sub;
     familyCouple.createdFullName = req.user.name;
@@ -168,6 +172,7 @@ export class ProfileFamilyCoupleEmployeeTempController extends Controller {
     familyCouple.lastUpdateFullName = req.user.name;
     familyCouple.createdAt = new Date();
     familyCouple.lastUpdatedAt = new Date();
+    familyCouple.couple = true;
     await this.ProfileFamilyCouple.save(familyCouple);
 
     profile.relationship = familyCouple.relationship; //update profileEmployee.relationship

src/controllers/ProfileSalaryTempController.ts

@@ -1005,7 +1005,7 @@ export class ProfileSalaryTempController extends Controller {
           ...rest,
           isDelete: false,
           isEdit: false,
-          isEntry: rest.isEntry,
+          isEntry: rest.isEntry ?? false,
           createdUserId: req.user.sub,
           createdFullName: req.user.name,
           lastUpdateUserId: req.user.sub,
@@ -1045,7 +1045,7 @@ export class ProfileSalaryTempController extends Controller {
           ...rest,
           isDelete: false,
           isEdit: false,
-          isEntry: rest.isEntry,
+          isEntry: rest.isEntry ?? false,
           createdUserId: req.user.sub,
           createdFullName: req.user.name,
           lastUpdateUserId: req.user.sub,