diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue
index c0f39f4..e8abc8d 100644
--- a/src/modules/08_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue
@@ -229,7 +229,7 @@ onMounted(() => {
       <!-- องค์ประกอบที่ 1 -->
       <div
         v-if="
-          store.dataEvaluation.posTypeName == 'อำนวยการ' &&
+          store.dataEvaluation.posTypeName == 'อำนวยการ' ||
           store.dataEvaluation.posTypeName == 'บริหาร'
         "
       >
diff --git a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
index 0147971..91ed807 100644
--- a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
@@ -171,7 +171,7 @@ function getData(type: string) {
         let resultAvg = result / total;
 
         if (
-          store.dataEvaluation.posTypeName == "อำนวยการ" &&
+          store.dataEvaluation.posTypeName == "อำนวยการ" ||
           store.dataEvaluation.posTypeName == "บริหาร"
         ) {
           store.competencyScoreVal =
diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue
index 5dda14e..2dc562b 100644
--- a/src/modules/08_KPI/views/form.vue
+++ b/src/modules/08_KPI/views/form.vue
@@ -506,8 +506,8 @@ onMounted(async () => {
                           store.dataEvaluation.posTypeName != 'อำนวยการ' &&
                           store.dataEvaluation.posTypeName != 'บริหาร' &&
                           store.indicatorWeightTotal != 100) ||
-                        (store.dataEvaluation.posTypeName == 'อำนวยการ' &&
-                          store.dataEvaluation.posTypeName == 'บริหาร' &&
+                        ((store.dataEvaluation.posTypeName == 'อำนวยการ' ||
+                          store.dataEvaluation.posTypeName == 'บริหาร') &&
                           (store.indicatorWeight1Total != 100 ||
                             store.indicatorWeight2Total != 20) &&
                           store.dataEvaluation.evaluationStatus == 'NEW')
@@ -525,8 +525,8 @@ onMounted(async () => {
                         (store.dataEvaluation.posTypeName != 'อำนวยการ' &&
                           store.dataEvaluation.posTypeName != 'บริหาร' &&
                           store.indicatorWeightTotal != 100) ||
-                        (store.dataEvaluation.posTypeName == 'อำนวยการ' &&
-                          store.dataEvaluation.posTypeName == 'บริหาร' &&
+                        ((store.dataEvaluation.posTypeName == 'อำนวยการ' ||
+                          store.dataEvaluation.posTypeName == 'บริหาร') &&
                           (store.indicatorWeight1Total != 100 ||
                             store.indicatorWeight2Total != 20))
                       "