diff --git a/src/controllers/KpiReasonController.ts b/src/controllers/KpiReasonController.ts
index eb013db..72187d1 100644
--- a/src/controllers/KpiReasonController.ts
+++ b/src/controllers/KpiReasonController.ts
@@ -88,10 +88,16 @@ export class kpiReasonController extends Controller {
       kpiUserEvaluationReason.type = type.trim().toUpperCase();
       if (type.trim().toUpperCase() == "PROBLEM") {
         kpiUserEvaluationReason.status =
-          kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ? "DONE" : "DAFT";
+          kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ||
+          kpiUserEvaluation.kpiUserEvaluation.evaluatorId == ""
+            ? "DONE"
+            : "DAFT";
       } else {
         kpiUserEvaluationReason.status =
-          kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ? "DONE" : "EVALUATOR";
+          kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ||
+          kpiUserEvaluation.kpiUserEvaluation.evaluatorId == ""
+            ? "DONE"
+            : "EVALUATOR";
       }
       kpiUserEvaluationReason.kpiUserPlannedId = id;
       kpiUserEvaluationReason.createdUserId = request.user.sub;
@@ -115,11 +121,15 @@ export class kpiReasonController extends Controller {
       if (user.trim().toUpperCase() == "EVALUATOR") {
         kpiReason.reasonEvaluator = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+          kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderId == null ||
+          kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderId == ""
+            ? "DONE"
+            : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
         kpiReason.reasonCommander = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderHighId == null
+          kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderHighId == null ||
+          kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
@@ -158,7 +168,10 @@ export class kpiReasonController extends Controller {
     }
 
     kpiReason.status =
-      kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+      kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderId == null ||
+      kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderId == ""
+        ? "DONE"
+        : "COMMANDER";
     kpiReason.reasonCommanderHigh = requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
@@ -246,7 +259,10 @@ export class kpiReasonController extends Controller {
       const kpiUserEvaluationReason = Object.assign(new KpiUserEvaluationReasonRole(), requestBody);
       kpiUserEvaluationReason.type = type.trim().toUpperCase();
       kpiUserEvaluationReason.status =
-        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ? "DONE" : "EVALUATOR";
+        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ||
+        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == ""
+          ? "DONE"
+          : "EVALUATOR";
       kpiUserEvaluationReason.kpiUserRoleId = id;
       kpiUserEvaluationReason.createdUserId = request.user.sub;
       kpiUserEvaluationReason.createdFullName = request.user.name;
@@ -269,11 +285,15 @@ export class kpiReasonController extends Controller {
       if (user.trim().toUpperCase() == "EVALUATOR") {
         kpiReason.reasonEvaluator = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserRole.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+          kpiReason.kpiUserRole.kpiUserEvaluation.commanderId == null ||
+          kpiReason.kpiUserRole.kpiUserEvaluation.commanderId == ""
+            ? "DONE"
+            : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
         kpiReason.reasonCommander = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserRole.kpiUserEvaluation.commanderHighId == null
+          kpiReason.kpiUserRole.kpiUserEvaluation.commanderHighId == null ||
+          kpiReason.kpiUserRole.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
@@ -312,7 +332,10 @@ export class kpiReasonController extends Controller {
     }
 
     kpiReason.status =
-      kpiReason.kpiUserRole.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+      kpiReason.kpiUserRole.kpiUserEvaluation.commanderId == null ||
+      kpiReason.kpiUserRole.kpiUserEvaluation.commanderId == ""
+        ? "DONE"
+        : "COMMANDER";
     kpiReason.reasonCommanderHigh = requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
@@ -403,7 +426,10 @@ export class kpiReasonController extends Controller {
       );
       kpiUserEvaluationReason.type = type.trim().toUpperCase();
       kpiUserEvaluationReason.status =
-        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ? "DONE" : "EVALUATOR";
+        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ||
+        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == ""
+          ? "DONE"
+          : "EVALUATOR";
       kpiUserEvaluationReason.kpiUserSpecialId = id;
       kpiUserEvaluationReason.createdUserId = request.user.sub;
       kpiUserEvaluationReason.createdFullName = request.user.name;
@@ -426,11 +452,15 @@ export class kpiReasonController extends Controller {
       if (user.trim().toUpperCase() == "EVALUATOR") {
         kpiReason.reasonEvaluator = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+          kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderId == null ||
+          kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderId == ""
+            ? "DONE"
+            : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
         kpiReason.reasonCommander = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderHighId == null
+          kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderHighId == null ||
+          kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
@@ -469,7 +499,10 @@ export class kpiReasonController extends Controller {
     }
 
     kpiReason.status =
-      kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+      kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderId == null ||
+      kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderId == ""
+        ? "DONE"
+        : "COMMANDER";
     kpiReason.reasonCommanderHigh = requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
@@ -560,7 +593,10 @@ export class kpiReasonController extends Controller {
       );
       kpiUserEvaluationReason.type = type.trim().toUpperCase();
       kpiUserEvaluationReason.status =
-        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ? "DONE" : "EVALUATOR";
+        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ||
+        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == ""
+          ? "DONE"
+          : "EVALUATOR";
       kpiUserEvaluationReason.kpiUserDevelopmentId = id;
       kpiUserEvaluationReason.createdUserId = request.user.sub;
       kpiUserEvaluationReason.createdFullName = request.user.name;
@@ -583,11 +619,15 @@ export class kpiReasonController extends Controller {
       if (user.trim().toUpperCase() == "EVALUATOR") {
         kpiReason.reasonEvaluator = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+          kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderId == null ||
+          kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderId == ""
+            ? "DONE"
+            : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
         kpiReason.reasonCommander = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderHighId == null
+          kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderHighId == null ||
+          kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
@@ -626,7 +666,10 @@ export class kpiReasonController extends Controller {
     }
 
     kpiReason.status =
-      kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+      kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderId == null ||
+      kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderId == ""
+        ? "DONE"
+        : "COMMANDER";
     kpiReason.reasonCommanderHigh = requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
@@ -721,7 +764,10 @@ export class kpiReasonController extends Controller {
       );
       kpiUserEvaluationReason.type = type.trim().toUpperCase();
       kpiUserEvaluationReason.status =
-        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ? "DONE" : "EVALUATOR";
+        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == null ||
+        kpiUserEvaluation.kpiUserEvaluation.evaluatorId == ""
+          ? "DONE"
+          : "EVALUATOR";
       kpiUserEvaluationReason.kpiUserCapacityId = id;
       kpiUserEvaluationReason.createdUserId = request.user.sub;
       kpiUserEvaluationReason.createdFullName = request.user.name;
@@ -744,11 +790,15 @@ export class kpiReasonController extends Controller {
       if (user.trim().toUpperCase() == "EVALUATOR") {
         kpiReason.reasonEvaluator = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+          kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderId == null ||
+          kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderId == ""
+            ? "DONE"
+            : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
         kpiReason.reasonCommander = requestBody.reason;
         kpiReason.status =
-          kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderHighId == null
+          kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderHighId == null ||
+          kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
@@ -787,7 +837,10 @@ export class kpiReasonController extends Controller {
     }
 
     kpiReason.status =
-      kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderId == null ? "DONE" : "COMMANDER";
+      kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderId == null ||
+      kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderId == ""
+        ? "DONE"
+        : "COMMANDER";
     kpiReason.reasonCommanderHigh = requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts
index 7c74d16..e4d7a6b 100644
--- a/src/controllers/KpiUserEvaluationController.ts
+++ b/src/controllers/KpiUserEvaluationController.ts
@@ -571,7 +571,7 @@ export class KpiUserEvaluationController extends Controller {
       if (requestBody.status.trim().toUpperCase() == "APPROVE") {
         if (role == "EVALUATOR") {
           if (item.evaluationStatus == "NEW_EVALUATOR") {
-            if (item.commanderId == null) {
+            if (item.commanderId == null || item.commanderId == "") {
               item.evaluationStatus = "APPROVE";
             } else {
               item.evaluationStatus = "NEW_COMMANDER";
@@ -579,7 +579,7 @@ export class KpiUserEvaluationController extends Controller {
           }
         } else if (role == "COMMANDER") {
           if (item.evaluationStatus == "NEW_COMMANDER") {
-            if (item.commanderHighId == null) {
+            if (item.commanderHighId == null || item.commanderHighId == "") {
               item.evaluationStatus = "APPROVE";
             } else {
               item.evaluationStatus = "NEW_COMMANDER_HIGH";
@@ -648,7 +648,7 @@ export class KpiUserEvaluationController extends Controller {
       if (requestBody.status.trim().toUpperCase() == "DONE") {
         if (role == "EVALUATOR") {
           if (item.evaluationReqEdit == "EVALUATOR") {
-            if (item.commanderId == null) {
+            if (item.commanderId == null || item.commanderId == "") {
               item.evaluationReqEdit = "DONE";
             } else {
               item.evaluationReqEdit = "COMMANDER";
@@ -656,7 +656,7 @@ export class KpiUserEvaluationController extends Controller {
           }
         } else if (role == "COMMANDER") {
           if (item.evaluationReqEdit == "COMMANDER") {
-            if (item.commanderHighId == null) {
+            if (item.commanderHighId == null || item.commanderHighId == "") {
               item.evaluationReqEdit = "DONE";
             } else {
               item.evaluationReqEdit = "COMMANDER_HIGH";
@@ -726,7 +726,7 @@ export class KpiUserEvaluationController extends Controller {
       if (requestBody.status.trim().toUpperCase() == "DONE") {
         if (role == "EVALUATOR") {
           if (item.evaluationStatus == "EVALUATING_EVALUATOR") {
-            if (item.commanderId == null) {
+            if (item.commanderId == null || item.commanderId == "") {
               item.evaluationStatus = "COMPLETE";
             } else {
               item.evaluationStatus = "EVALUATING_COMMANDER";
@@ -735,7 +735,7 @@ export class KpiUserEvaluationController extends Controller {
           }
         } else if (role == "COMMANDER") {
           if (item.evaluationStatus == "EVALUATING_COMMANDER") {
-            if (item.commanderHighId == null) {
+            if (item.commanderHighId == null || item.commanderHighId == "") {
               item.evaluationStatus = "COMPLETE";
             } else {
               item.evaluationStatus = "EVALUATING_COMMANDER_HIGH";