diff --git a/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html b/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html
index 62114b3..6d413f1 100644
--- a/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html
+++ b/src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html
@@ -183,7 +183,7 @@
                         <div
                             class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
                             <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 1;selectEMP()">
+                                (click)="empnumber = 1;selectEMP();empnumber = 2;selectEMP();empnumber = 3;selectEMP();empnumber = 4;selectEMP();empnumber = 5;selectEMP()">
                                 <i class="ti ti-circle-x cursor-pointer"></i>
                             </button>
                             <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
@@ -193,86 +193,94 @@
                         </div>
                     </div>
                 </div>
-                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 2</label>
-                <div class="flex">
-                    <div class="relative flex rounded-md w-2/3">
-                        <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
-                            class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
-                            style="padding-right: 2.5rem;"
-                            [value]="groupapprove.apsapprove2.fname +' '+groupapprove.apsapprove2.lname">
-                        <div
-                            class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
-                            <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 2;selectEMP()">
-                                <i class="ti ti-circle-x cursor-pointer"></i>
-                            </button>
-                            <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
-                                data-hs-overlay="#set-approvers-table-modal" (click)="empnumber = 2">
-                                <i class="ri-search-line cursor-pointer text-gray"></i>
-                            </button>
+                <ng-container *ngIf="groupapprove.apsapprove1.employeeId">
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 2</label>
+                    <div class="flex">
+                        <div class="relative flex rounded-md w-2/3">
+                            <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
+                                class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
+                                style="padding-right: 2.5rem;"
+                                [value]="groupapprove.apsapprove2.fname +' '+groupapprove.apsapprove2.lname">
+                            <div
+                                class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
+                                <button type="button" class="flex items-center text-red-500"
+                                    (click)="empnumber = 2;selectEMP();empnumber = 3;selectEMP();empnumber = 4;selectEMP();empnumber = 5;selectEMP()">
+                                    <i class="ti ti-circle-x cursor-pointer"></i>
+                                </button>
+                                <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
+                                    data-hs-overlay="#set-approvers-table-modal" (click)="empnumber = 2">
+                                    <i class="ri-search-line cursor-pointer text-gray"></i>
+                                </button>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 3</label>
-                <div class="flex">
-                    <div class="relative flex rounded-md w-2/3">
-                        <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
-                            class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
-                            style="padding-right: 2.5rem;"
-                            [value]="groupapprove.apsapprove3.fname +' '+groupapprove.apsapprove3.lname">
-                        <div
-                            class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
-                            <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 3;selectEMP()">
-                                <i class="ti ti-circle-x cursor-pointer"></i>
-                            </button>
-                            <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
-                                data-hs-overlay="#set-approvers-table-modal" (click)="empnumber = 3">
-                                <i class="ri-search-line cursor-pointer text-gray"></i>
-                            </button>
+                </ng-container>
+                <ng-container *ngIf="groupapprove.apsapprove2.employeeId">
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 3</label>
+                    <div class="flex">
+                        <div class="relative flex rounded-md w-2/3">
+                            <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
+                                class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
+                                style="padding-right: 2.5rem;"
+                                [value]="groupapprove.apsapprove3.fname +' '+groupapprove.apsapprove3.lname">
+                            <div
+                                class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
+                                <button type="button" class="flex items-center text-red-500"
+                                    (click)="empnumber = 3;selectEMP();empnumber = 4;selectEMP();empnumber = 5;selectEMP()">
+                                    <i class="ti ti-circle-x cursor-pointer"></i>
+                                </button>
+                                <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
+                                    data-hs-overlay="#set-approvers-table-modal" (click)="empnumber = 3">
+                                    <i class="ri-search-line cursor-pointer text-gray"></i>
+                                </button>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 4</label>
-                <div class="flex">
-                    <div class="relative flex rounded-md w-2/3">
-                        <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
-                            class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
-                            style="padding-right: 2.5rem;"
-                            [value]="groupapprove.apsapprove4.fname +' '+groupapprove.apsapprove4.lname">
-                        <div
-                            class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
-                            <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 4;selectEMP()">
-                                <i class="ti ti-circle-x cursor-pointer"></i>
-                            </button>
-                            <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
-                                data-hs-overlay="#set-approvers-table-modal" (click)="empnumber = 4">
-                                <i class="ri-search-line cursor-pointer text-gray"></i>
-                            </button>
+                </ng-container>
+                <ng-container *ngIf="groupapprove.apsapprove3.employeeId">
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 4</label>
+                    <div class="flex">
+                        <div class="relative flex rounded-md w-2/3">
+                            <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
+                                class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
+                                style="padding-right: 2.5rem;"
+                                [value]="groupapprove.apsapprove4.fname +' '+groupapprove.apsapprove4.lname">
+                            <div
+                                class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
+                                <button type="button" class="flex items-center text-red-500"
+                                    (click)="empnumber = 4;selectEMP();empnumber = 5;selectEMP()">
+                                    <i class="ti ti-circle-x cursor-pointer"></i>
+                                </button>
+                                <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
+                                    data-hs-overlay="#set-approvers-table-modal" (click)="empnumber = 4">
+                                    <i class="ri-search-line cursor-pointer text-gray"></i>
+                                </button>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 5</label>
-                <div class="flex">
-                    <div class="relative flex rounded-md w-2/3">
-                        <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
-                            class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
-                            style="padding-right: 2.5rem;"
-                            [value]="groupapprove.apsapprove5.fname +' '+groupapprove.apsapprove5.lname">
-                        <div
-                            class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
-                            <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 5;selectEMP()">
-                                <i class="ti ti-circle-x cursor-pointer"></i>
-                            </button>
-                            <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
-                                data-hs-overlay="#set-approvers-table-modal" (click)="empnumber = 5">
-                                <i class="ri-search-line cursor-pointer text-gray"></i>
-                            </button>
+                </ng-container>
+                <ng-container *ngIf="groupapprove.apsapprove4.employeeId">
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 5</label>
+                    <div class="flex">
+                        <div class="relative flex rounded-md w-2/3">
+                            <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
+                                class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
+                                style="padding-right: 2.5rem;"
+                                [value]="groupapprove.apsapprove5.fname +' '+groupapprove.apsapprove5.lname">
+                            <div
+                                class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
+                                <button type="button" class="flex items-center text-red-500"
+                                    (click)="empnumber = 5;selectEMP()">
+                                    <i class="ti ti-circle-x cursor-pointer"></i>
+                                </button>
+                                <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
+                                    data-hs-overlay="#set-approvers-table-modal" (click)="empnumber = 5">
+                                    <i class="ri-search-line cursor-pointer text-gray"></i>
+                                </button>
+                            </div>
                         </div>
                     </div>
-                </div>
+                </ng-container>
                 <div class="flex justify-end mt-3rem mb-1rem space-x-4">
                     <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
diff --git a/src/app/components/performance-management-evaluation/assessment-management/assigning-approvers/assigning-approvers.component.html b/src/app/components/performance-management-evaluation/assessment-management/assigning-approvers/assigning-approvers.component.html
index 381d9e4..161a4d9 100644
--- a/src/app/components/performance-management-evaluation/assessment-management/assigning-approvers/assigning-approvers.component.html
+++ b/src/app/components/performance-management-evaluation/assessment-management/assigning-approvers/assigning-approvers.component.html
@@ -176,7 +176,7 @@
                         <div
                             class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
                             <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 1;selectEMP()">
+                                (click)="empnumber = 1;selectEMP();empnumber = 2;selectEMP();empnumber = 3;selectEMP();empnumber = 4;selectEMP();empnumber = 5;selectEMP()">
                                 <i class="ti ti-circle-x cursor-pointer"></i>
                             </button>
                             <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
@@ -186,86 +186,94 @@
                         </div>
                     </div>
                 </div>
-                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 2</label>
-                <div class="flex">
-                    <div class="relative flex rounded-md w-2/3">
-                        <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
-                            class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
-                            style="padding-right: 2.5rem;"
-                            [value]="groupapprove.apsapprove2.fname +' '+groupapprove.apsapprove2.lname">
-                        <div
-                            class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
-                            <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 2;selectEMP()">
-                                <i class="ti ti-circle-x cursor-pointer"></i>
-                            </button>
-                            <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
-                                data-hs-overlay="#assigning-approvers-table-modal-edit" (click)="empnumber = 2">
-                                <i class="ri-search-line cursor-pointer text-gray"></i>
-                            </button>
+                <ng-container *ngIf="groupapprove.apsapprove1.employeeId">
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 2</label>
+                    <div class="flex">
+                        <div class="relative flex rounded-md w-2/3">
+                            <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
+                                class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
+                                style="padding-right: 2.5rem;"
+                                [value]="groupapprove.apsapprove2.fname +' '+groupapprove.apsapprove2.lname">
+                            <div
+                                class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
+                                <button type="button" class="flex items-center text-red-500"
+                                    (click)="empnumber = 2;selectEMP();empnumber = 3;selectEMP();empnumber = 4;selectEMP();empnumber = 5;selectEMP()">
+                                    <i class="ti ti-circle-x cursor-pointer"></i>
+                                </button>
+                                <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
+                                    data-hs-overlay="#assigning-approvers-table-modal-edit" (click)="empnumber = 2">
+                                    <i class="ri-search-line cursor-pointer text-gray"></i>
+                                </button>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 3</label>
-                <div class="flex">
-                    <div class="relative flex rounded-md w-2/3">
-                        <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
-                            class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
-                            style="padding-right: 2.5rem;"
-                            [value]="groupapprove.apsapprove3.fname +' '+groupapprove.apsapprove3.lname">
-                        <div
-                            class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
-                            <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 3;selectEMP()">
-                                <i class="ti ti-circle-x cursor-pointer"></i>
-                            </button>
-                            <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
-                                data-hs-overlay="#assigning-approvers-table-modal-edit" (click)="empnumber = 3">
-                                <i class="ri-search-line cursor-pointer text-gray"></i>
-                            </button>
+                </ng-container>
+                <ng-container *ngIf="groupapprove.apsapprove2.employeeId">
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 3</label>
+                    <div class="flex">
+                        <div class="relative flex rounded-md w-2/3">
+                            <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
+                                class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
+                                style="padding-right: 2.5rem;"
+                                [value]="groupapprove.apsapprove3.fname +' '+groupapprove.apsapprove3.lname">
+                            <div
+                                class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
+                                <button type="button" class="flex items-center text-red-500"
+                                    (click)="empnumber = 3;selectEMP();empnumber = 4;selectEMP();empnumber = 5;selectEMP()">
+                                    <i class="ti ti-circle-x cursor-pointer"></i>
+                                </button>
+                                <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
+                                    data-hs-overlay="#assigning-approvers-table-modal-edit" (click)="empnumber = 3">
+                                    <i class="ri-search-line cursor-pointer text-gray"></i>
+                                </button>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 4</label>
-                <div class="flex">
-                    <div class="relative flex rounded-md w-2/3">
-                        <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
-                            class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
-                            style="padding-right: 2.5rem;"
-                            [value]="groupapprove.apsapprove4.fname +' '+groupapprove.apsapprove4.lname">
-                        <div
-                            class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
-                            <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 4;selectEMP()">
-                                <i class="ti ti-circle-x cursor-pointer"></i>
-                            </button>
-                            <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
-                                data-hs-overlay="#assigning-approvers-table-modal-edit" (click)="empnumber = 4">
-                                <i class="ri-search-line cursor-pointer text-gray"></i>
-                            </button>
+                </ng-container>
+                <ng-container *ngIf="groupapprove.apsapprove3.employeeId">
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 4</label>
+                    <div class="flex">
+                        <div class="relative flex rounded-md w-2/3">
+                            <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
+                                class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
+                                style="padding-right: 2.5rem;"
+                                [value]="groupapprove.apsapprove4.fname +' '+groupapprove.apsapprove4.lname">
+                            <div
+                                class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
+                                <button type="button" class="flex items-center text-red-500"
+                                    (click)="empnumber = 4;selectEMP();empnumber = 5;selectEMP()">
+                                    <i class="ti ti-circle-x cursor-pointer"></i>
+                                </button>
+                                <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
+                                    data-hs-overlay="#assigning-approvers-table-modal-edit" (click)="empnumber = 4">
+                                    <i class="ri-search-line cursor-pointer text-gray"></i>
+                                </button>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 5</label>
-                <div class="flex">
-                    <div class="relative flex rounded-md w-2/3">
-                        <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
-                            class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
-                            style="padding-right: 2.5rem;"
-                            [value]="groupapprove.apsapprove5.fname +' '+groupapprove.apsapprove5.lname">
-                        <div
-                            class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
-                            <button type="button" class="flex items-center text-red-500"
-                                (click)="empnumber = 5;selectEMP()">
-                                <i class="ti ti-circle-x cursor-pointer"></i>
-                            </button>
-                            <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
-                                data-hs-overlay="#assigning-approvers-table-modal-edit" (click)="empnumber = 5">
-                                <i class="ri-search-line cursor-pointer text-gray"></i>
-                            </button>
+                </ng-container>
+                <ng-container *ngIf="groupapprove.apsapprove4.employeeId">
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 5</label>
+                    <div class="flex">
+                        <div class="relative flex rounded-md w-2/3">
+                            <input type="text" name="hs-leading-button-add-on-with-icon-and-button"
+                                class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" readonly
+                                style="padding-right: 2.5rem;"
+                                [value]="groupapprove.apsapprove5.fname +' '+groupapprove.apsapprove5.lname">
+                            <div
+                                class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
+                                <button type="button" class="flex items-center text-red-500"
+                                    (click)="empnumber = 5;selectEMP()">
+                                    <i class="ti ti-circle-x cursor-pointer"></i>
+                                </button>
+                                <button type="button" class="flex items-center text-gray-500 dark:text-white/70"
+                                    data-hs-overlay="#assigning-approvers-table-modal-edit" (click)="empnumber = 5">
+                                    <i class="ri-search-line cursor-pointer text-gray"></i>
+                                </button>
+                            </div>
                         </div>
                     </div>
-                </div>
+                </ng-container>
                 <div class="flex justify-end mt-3rem mb-1rem space-x-4">
                     <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"