diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index f0ba1287..6b158ee7 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -2039,13 +2039,13 @@ export class CommandController extends Controller {
     body: {
       data: {
         bodyProfile: CreateProfileAllFields;
-        bodyEducations: CreateProfileEducation[];
-        bodyCertificates: CreateProfileCertificate[];
-        bodySalarys: CreateProfileSalary;
-        bodyPosition: {
+        bodyEducations?: CreateProfileEducation[];
+        bodyCertificates?: CreateProfileCertificate[];
+        bodySalarys?: CreateProfileSalary | null;
+        bodyPosition?: {
           posmasterId: string;
           positionId: string;
-        };
+        } | null;
       }[];
     },
   ) {
@@ -2101,109 +2101,119 @@ export class CommandController extends Controller {
           await this.profileRepository.save(profile);
           setLogDataDiff(req, { before, after: profile });
         }
-        
         if(profile && profile.id) {
           //Educations
-          await Promise.all(
-            item.bodyEducations.map(async (education) => {
-              const profileEdu = new ProfileEducation();
-              Object.assign(profileEdu, { ...education, ...meta });
-              const eduHistory = new ProfileEducationHistory();
-              Object.assign(eduHistory, { ...profileEdu, id: undefined });
-              profileEdu.profileId = profile.id;
-              await this.profileEducationRepo.save(profileEdu, { data: req });
-              setLogDataDiff(req, { before, after: profileEdu });
-              eduHistory.profileEducationId = profileEdu.id;
-              await this.profileEducationHistoryRepo.save(eduHistory, { data: req });
-            }),
-          );
+          if(item.bodyEducations && item.bodyEducations.length > 0) {
+            await Promise.all(
+              item.bodyEducations.map(async (education) => {
+                const profileEdu = new ProfileEducation();
+                Object.assign(profileEdu, { ...education, ...meta });
+                const eduHistory = new ProfileEducationHistory();
+                Object.assign(eduHistory, { ...profileEdu, id: undefined });
+                profileEdu.profileId = profile.id;
+                await this.profileEducationRepo.save(profileEdu, { data: req });
+                setLogDataDiff(req, { before, after: profileEdu });
+                eduHistory.profileEducationId = profileEdu.id;
+                await this.profileEducationHistoryRepo.save(eduHistory, { data: req });
+              }),
+            );
+          }
+          
           //Certificates
-          await Promise.all(
-            item.bodyCertificates.map(async (cer) => {
-              const profileCer = new ProfileCertificate();
-              Object.assign(profileCer, { ...cer, ...meta });
-              const cerHistory = new ProfileCertificateHistory();
-              Object.assign(cerHistory, { ...profileCer, id: undefined });
-              profileCer.profileId = profile.id
-              await this.certificateRepo.save(profileCer, { data: req });
-              setLogDataDiff(req, { before, after: profileCer });
-              cerHistory.profileCertificateId = profileCer.id;
-              await this.certificateHistoryRepo.save(cerHistory, { data: req });
-            }),
-          );
+          if(item.bodyCertificates && item.bodyCertificates.length > 0) {
+            await Promise.all(
+              item.bodyCertificates.map(async (cer) => {
+                const profileCer = new ProfileCertificate();
+                Object.assign(profileCer, { ...cer, ...meta });
+                const cerHistory = new ProfileCertificateHistory();
+                Object.assign(cerHistory, { ...profileCer, id: undefined });
+                profileCer.profileId = profile.id
+                await this.certificateRepo.save(profileCer, { data: req });
+                setLogDataDiff(req, { before, after: profileCer });
+                cerHistory.profileCertificateId = profileCer.id;
+                await this.certificateHistoryRepo.save(cerHistory, { data: req });
+              }),
+            );
+          }
+
           //Salary
-          const dest_item = await this.salaryRepo.findOne({
-            where: { profileId: profile.id },
-            order: { order: "DESC" },
-          });
-          const profileSal = new ProfileSalary();
-          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
-          await this.salaryRepo.save(profileSal, { data: req });
-          setLogDataDiff(req, { before, after: profileSal });
-          salaryHistory.profileSalaryId = profileSal.id;
-          await this.salaryHistoryRepo.save(salaryHistory, { data: req });
+          if(item.bodySalarys && item.bodySalarys != null) {
+            const dest_item = await this.salaryRepo.findOne({
+              where: { profileId: profile.id },
+              order: { order: "DESC" },
+            });
+            const profileSal = new ProfileSalary();
+            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
+            await this.salaryRepo.save(profileSal, { data: req });
+            setLogDataDiff(req, { before, after: profileSal });
+            salaryHistory.profileSalaryId = profileSal.id;
+            await this.salaryHistoryRepo.save(salaryHistory, { data: req });
+          }
+
           //Position
-          const posMaster = await this.posMasterRepository.findOne({
-            where: { id: item.bodyPosition.posmasterId },
-          });
-          if (posMaster == null) 
-            throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตำแหน่งนี้");
-
-          const posMasterOld = await this.posMasterRepository.findOne({
-            where: {
-              current_holderId: profile.id,
-              orgRevisionId: posMaster.orgRevisionId,
-            },
-          });
-          if (posMasterOld != null) posMasterOld.current_holderId = null;
-
-          const positionOld = await this.positionRepository.findOne({
-            where: {
-              posMasterId: posMasterOld?.id,
-              positionIsSelected: true,
-            },
-          });
-          if (positionOld != null) {
-            positionOld.positionIsSelected = false;
-            await this.positionRepository.save(positionOld);
-          }
-
-          const checkPosition = await this.positionRepository.find({
-            where: {
-              posMasterId: item.bodyPosition.posmasterId,
-              positionIsSelected: true,
-            },
-          });
-          if (checkPosition.length > 0) {
-            const clearPosition = checkPosition.map((positions) => ({
-              ...positions,
-              positionIsSelected: false,
-            }));
-            await this.positionRepository.save(clearPosition);
-          }
-
-          posMaster.current_holderId = profile.id;
-          if (posMasterOld != null) await this.posMasterRepository.save(posMasterOld);
-          await this.posMasterRepository.save(posMaster);
-
-          const positionNew = await this.positionRepository.findOne({
-            where: {
-              id: item.bodyPosition.positionId,
-              posMasterId: item.bodyPosition.posmasterId,
-            },
-          });
-          if (positionNew != null) {
-            positionNew.positionIsSelected = true;
-            profile.posLevelId = positionNew.posLevelId;
-            profile.posTypeId = positionNew.posTypeId;
-            profile.position = positionNew.positionName;
-            await this.profileRepository.save(profile, { data: req }); 
-            setLogDataDiff(req, { before, after: profile });
-            await this.positionRepository.save(positionNew, { data: req });
+          if(item.bodyPosition && item.bodyPosition != null) {
+            const posMaster = await this.posMasterRepository.findOne({
+              where: { id: item.bodyPosition.posmasterId },
+            });
+            if (posMaster == null) 
+              throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตำแหน่งนี้");
+  
+            const posMasterOld = await this.posMasterRepository.findOne({
+              where: {
+                current_holderId: profile.id,
+                orgRevisionId: posMaster.orgRevisionId,
+              },
+            });
+            if (posMasterOld != null) posMasterOld.current_holderId = null;
+  
+            const positionOld = await this.positionRepository.findOne({
+              where: {
+                posMasterId: posMasterOld?.id,
+                positionIsSelected: true,
+              },
+            });
+            if (positionOld != null) {
+              positionOld.positionIsSelected = false;
+              await this.positionRepository.save(positionOld);
+            }
+  
+            const checkPosition = await this.positionRepository.find({
+              where: {
+                posMasterId: item.bodyPosition.posmasterId,
+                positionIsSelected: true,
+              },
+            });
+            if (checkPosition.length > 0) {
+              const clearPosition = checkPosition.map((positions) => ({
+                ...positions,
+                positionIsSelected: false,
+              }));
+              await this.positionRepository.save(clearPosition);
+            }
+  
+            posMaster.current_holderId = profile.id;
+            if (posMasterOld != null) await this.posMasterRepository.save(posMasterOld);
+            await this.posMasterRepository.save(posMaster);
+  
+            const positionNew = await this.positionRepository.findOne({
+              where: {
+                id: item.bodyPosition.positionId,
+                posMasterId: item.bodyPosition.posmasterId,
+              },
+            });
+            if (positionNew != null) {
+              positionNew.positionIsSelected = true;
+              profile.posLevelId = positionNew.posLevelId;
+              profile.posTypeId = positionNew.posTypeId;
+              profile.position = positionNew.positionName;
+              await this.profileRepository.save(profile, { data: req }); 
+              setLogDataDiff(req, { before, after: profile });
+              await this.positionRepository.save(positionNew, { data: req });
+            }
           }
         }
       }),