diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java
index a873e021..1495ff82 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java
@@ -307,9 +307,12 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 		StringBuffer buffer = new StringBuffer();
 		List<Map<String, Object>> list = new ArrayList<>();
 
-		List<Integer> listPegawaiByUnitKerja = pegawaiDao.getPegawaiByIdUnitKerja(idUnitKerja);
-		if (CommonUtil.isNullOrEmpty(listPegawaiByUnitKerja)) {
-			return list;
+		List<Integer> listPegawaiByUnitKerja = new ArrayList<>();
+		if (CommonUtil.isNotNullOrEmpty(idUnitKerja)) {
+			listPegawaiByUnitKerja = pegawaiDao.getPegawaiByIdUnitKerja(idUnitKerja);
+			if (CommonUtil.isNullOrEmpty(listPegawaiByUnitKerja)) {
+				return list;
+			}
 		}
 
 		buffer.append("select new map (pegawai.id as idPegawai," + "pegawai.nama as nama,"