diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index 720075f..28badc8 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -70,56 +70,56 @@ export class SalaryPeriodController extends Controller {
 
     const data = {
       group1id:
-        salaryPeriod.salaryOrgs.find(
+      salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
           (x) =>
             x.group == "GROUP1" &&
             x.rootId == body.rootId &&
             x.snapshot == body.snapshot.toLocaleUpperCase(),
         ) == null
           ? null
-          : salaryPeriod.salaryOrgs.find(
+          : salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
               (x) =>
                 x.group == "GROUP1" &&
                 x.rootId == body.rootId &&
                 x.snapshot == body.snapshot.toLocaleUpperCase(),
             )?.id,
       group1IsClose:
-        salaryPeriod.salaryOrgs.find(
+      salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
           (x) =>
             x.group == "GROUP1" &&
             x.rootId == body.rootId &&
             x.snapshot == body.snapshot.toLocaleUpperCase(),
         ) == null
           ? null
-          : salaryPeriod.salaryOrgs.find(
+          : salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
               (x) =>
                 x.group == "GROUP1" &&
                 x.rootId == body.rootId &&
                 x.snapshot == body.snapshot.toLocaleUpperCase(),
             )?.isClose,
       group2id:
-        salaryPeriod.salaryOrgs.find(
+      salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
           (x) =>
             x.group == "GROUP2" &&
             x.rootId == body.rootId &&
             x.snapshot == body.snapshot.toLocaleUpperCase(),
         ) == null
           ? null
-          : salaryPeriod.salaryOrgs.find(
+          : salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
               (x) =>
                 x.group == "GROUP2" &&
                 x.rootId == body.rootId &&
                 x.snapshot == body.snapshot.toLocaleUpperCase(),
             )?.id,
       group2IsClose:
-        salaryPeriod.salaryOrgs.find(
+      salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
           (x) =>
             x.group == "GROUP2" &&
             x.rootId == body.rootId &&
             x.snapshot == body.snapshot.toLocaleUpperCase(),
         ) == null
           ? null
-          : salaryPeriod.salaryOrgs.find(
+          : salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
               (x) =>
                 x.group == "GROUP2" &&
                 x.rootId == body.rootId &&
diff --git a/src/controllers/SalaryPeriodEmployeeController.ts b/src/controllers/SalaryPeriodEmployeeController.ts
index 6860b13..68f7a70 100644
--- a/src/controllers/SalaryPeriodEmployeeController.ts
+++ b/src/controllers/SalaryPeriodEmployeeController.ts
@@ -67,59 +67,58 @@ export class SalaryPeriodEmployeeController extends Controller {
     if (!salaryPeriod) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบรอบการขึ้นเงินเดือน");
     }
-
     const data = {
       group1id:
-        salaryPeriod.salaryOrgEmployees.find(
+        salaryPeriod.salaryOrgEmployees && salaryPeriod.salaryOrgEmployees.find(
           (x) =>
             x.group == "GROUP1" &&
             x.rootId == body.rootId &&
             x.snapshot == body.snapshot.toLocaleUpperCase(),
         ) == null
           ? null
-          : salaryPeriod.salaryOrgEmployees.find(
+          : salaryPeriod.salaryOrgEmployees && salaryPeriod.salaryOrgEmployees.find(
               (x) =>
                 x.group == "GROUP1" &&
                 x.rootId == body.rootId &&
                 x.snapshot == body.snapshot.toLocaleUpperCase(),
             )?.id,
       group1IsClose:
-        salaryPeriod.salaryOrgs.find(
+       salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
           (x) =>
             x.group == "GROUP1" &&
             x.rootId == body.rootId &&
             x.snapshot == body.snapshot.toLocaleUpperCase(),
         ) == null
           ? null
-          : salaryPeriod.salaryOrgs.find(
+          : salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
               (x) =>
                 x.group == "GROUP1" &&
                 x.rootId == body.rootId &&
                 x.snapshot == body.snapshot.toLocaleUpperCase(),
             )?.isClose,
       group2id:
-        salaryPeriod.salaryOrgEmployees.find(
+        salaryPeriod.salaryOrgEmployees && salaryPeriod.salaryOrgEmployees.find(
           (x) =>
             x.group == "GROUP2" &&
             x.rootId == body.rootId &&
             x.snapshot == body.snapshot.toLocaleUpperCase(),
         ) == null
           ? null
-          : salaryPeriod.salaryOrgEmployees.find(
+          : salaryPeriod.salaryOrgEmployees && salaryPeriod.salaryOrgEmployees.find(
               (x) =>
                 x.group == "GROUP2" &&
                 x.rootId == body.rootId &&
                 x.snapshot == body.snapshot.toLocaleUpperCase(),
             )?.id,
       group2IsClose:
-        salaryPeriod.salaryOrgs.find(
+        salaryPeriod.salaryOrgs &&salaryPeriod.salaryOrgs.find(
           (x) =>
             x.group == "GROUP2" &&
             x.rootId == body.rootId &&
             x.snapshot == body.snapshot.toLocaleUpperCase(),
         ) == null
           ? null
-          : salaryPeriod.salaryOrgs.find(
+          : salaryPeriod.salaryOrgs && salaryPeriod.salaryOrgs.find(
               (x) =>
                 x.group == "GROUP2" &&
                 x.rootId == body.rootId &&
@@ -128,6 +127,8 @@ export class SalaryPeriodEmployeeController extends Controller {
       effectiveDate: salaryPeriod.effectiveDate,
       period: salaryPeriod.period,
     };
+
+
     return new HttpSuccess(data);
   }