From c9a5f37d47260b73911421228d2716c39cac2321 Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe.rsabhk@gmail.com>
Date: Thu, 15 Apr 2021 14:51:42 +0700
Subject: [PATCH] - perbaikan service get untuk grid master Jabatan - penerapan
 jenis jabatan jfu, jft dan manajerial di service mapping indikator jabatan

---
 .../medifirst2000/dao/IndikatorKinerjaJabatanDao.java        | 2 +-
 .../java/com/jasamedika/medifirst2000/dao/JabatanDao.java    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaJabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaJabatanDao.java
index 3d6047d1..1cc805f6 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaJabatanDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaJabatanDao.java
@@ -31,7 +31,7 @@ public interface IndikatorKinerjaJabatanDao extends PagingAndSortingRepository<I
 			+ "jj.id as jenisJabatanId,jj.jenisJabatan as jenisJabatan,"
 			+ "jb.id as jabatanId,jb.namaJabatan as namaJabatan) " + "from Jabatan jb "
 			+ "inner join jb.jenisJabatan jj " + "inner join jb.unitKerja uk " + "where jb.statusEnabled is true "
-			+ "and jj.statusEnabled is true " + "and uk.statusEnabled is true "
+			+ "and jj.statusEnabled is true and jj.id in (7,8,9) " + "and uk.statusEnabled is true "
 			+ "order by uk.name, jj.jenisJabatan, jb.namaJabatan")
 	List<Map<String, Object>> findAllJabatan();
 
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 244107c4..b099993d 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
@@ -75,9 +75,8 @@ public interface JabatanDao extends PagingAndSortingRepository<Jabatan, Integer>
 			+ "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.statusEnabled is true "
-			+ "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";
+			+ "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";
 
 	String namaJabatan = " and lower(jb.namaJabatan) like %:namaJabatan%";