diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java
index b099993d..b5f7a33c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java
@@ -74,9 +74,11 @@ public interface JabatanDao extends PagingAndSortingRepository<Jabatan, Integer>
 			+ "jj.id as jenisJabatanId,jj.jenisJabatan as jenisJabatan," + "uk.id as unitKerjaId,uk.name as unitKerja,"
 			+ "el.id as eselonId,el.eselon as eselon,"
 			+ "kj.id as kelompokJabatanId,kj.namaKelompokJabatan as kelompokJabatan) " + "from Jabatan jb "
-			+ "inner join jb.jenisJabatan jj " + "inner join jb.unitKerja uk "
-			+ "left join jb.eselon el with el.id <> 0 " + "left join jb.kelompokJabatan kj with kj.id between 1 and 10 "
-			+ "where jb.statusEnabled is true " + "and jj.statusEnabled is true " + "and uk.statusEnabled is true";
+			+ "inner join jb.jenisJabatan jj "
+			+ "left join jb.unitKerja uk with (uk.id <> 0 and uk.statusEnabled is true) "
+			+ "left join jb.eselon el with (el.id <> 0 and el.statusEnabled is true) "
+			+ "left join jb.kelompokJabatan kj with (kj.id between 1 and 10 and kj.statusEnabled is true) "
+			+ "where jb.statusEnabled is true " + "and jj.statusEnabled is true ";
 
 	String namaJabatan = " and lower(jb.namaJabatan) like %:namaJabatan%";