diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 5bee8980..07dddf3c 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -3500,7 +3500,7 @@ export class CommandController extends Controller {
         }
 
         let profile: any = await this.profileRepository.findOne({
-          where: { citizenId: item.bodyProfile.citizenId },
+          where: { citizenId: item.bodyProfile.citizenId, isActive: true },
           relations: ["roleKeycloaks"],
         });
         if (!profile) {
diff --git a/src/controllers/OrganizationUnauthorizeController.ts b/src/controllers/OrganizationUnauthorizeController.ts
index efa49a38..424a30eb 100644
--- a/src/controllers/OrganizationUnauthorizeController.ts
+++ b/src/controllers/OrganizationUnauthorizeController.ts
@@ -167,7 +167,7 @@ export class OrganizationUnauthorizeController extends Controller {
       //   item.current_holder == null || item.current_holder.profileSalary.length == 0
       //     ? null
       //     : item.current_holder.profileSalary.sort((a: any, b: any) => b.date - a.date)[0].amount;
-      const amount = item.current_holder?item.current_holder.amount:null;
+      const amount = item.current_holder ? item.current_holder.amount : null;
       let datePeriodStart = new Date(
         `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, "0")}-${String(new Date().getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,
       );
@@ -385,7 +385,7 @@ export class OrganizationUnauthorizeController extends Controller {
       //   item.current_holder == null || item.current_holder.profileSalary.length == 0
       //     ? null
       //     : item.current_holder.profileSalary.sort((a: any, b: any) => b.date - a.date)[0].amount;
-      const amount = item.current_holder?item.current_holder.amount:null;
+      const amount = item.current_holder ? item.current_holder.amount : null;
       let datePeriodStart = new Date(
         `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, "0")}-${String(new Date().getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,
       );
@@ -947,7 +947,7 @@ export class OrganizationUnauthorizeController extends Controller {
     if (val >= 70 && val <= 79) return "ดี";
     if (val >= 80 && val <= 89) return "ดีมาก";
     if (val >= 90 && val <= 100) return "ดีเด่น";
-    if (val > 101 ) return "ดีเด่น";
+    if (val > 101) return "ดีเด่น";
     else return "-";
   }
 
diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index bce70c68..cad83449 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -5829,7 +5829,7 @@ export class ProfileController extends Controller {
   @Get("citizenid/position/{id}")
   async getProfileByCitizenId(@Request() request: RequestWithUser, @Path() id: string) {
     const profile = await this.profileRepo.findOne({
-      where: { citizenId: id },
+      where: { citizenId: id, isActive: true },
       relations: [
         "posLevel",
         "posType",