From b8cdebe9d9d9f4895d6a35ebf067e0864c6d5eca Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe.rsabhk@gmail.com>
Date: Thu, 20 May 2021 20:15:47 +0700
Subject: [PATCH] perbaikan service data penempatan evaluasi jabatan

---
 .../dao/NilaiKelompokJabatanDao.java          |  2 +-
 .../impl/NilaiKelompokJabatanServiceImpl.java | 22 +------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java
index 50b669da..411b6f92 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java
@@ -62,7 +62,7 @@ public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository<Nila
 			+ "and mj.statusEnabled is true " + "and ej.statusEnabled is true " + "and pg.statusEnabled is true "
 			+ "and j.statusEnabled is true " + "and uk.statusEnabled is true " + "and dkj.statusEnabled is true "
 			+ "and kj.statusEnabled is true " + "and pg.kategoryPegawaiId in (:listKategoriId) "
-			+ "order by pg.namaLengkap, pg.id, ej.totalNilai desc")
+			+ "order by pg.namaLengkap")
 	public List<Map<String, Object>> findPenempatanEvaluasiJabatan(
 			@Param("listKategoriId") List<Integer> idListKategori);
 
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java
index 78ac613b..8534e214 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java
@@ -122,29 +122,9 @@ public class NilaiKelompokJabatanServiceImpl extends BaseVoServiceImpl implement
 
 	@Override
 	public List<Map<String, Object>> getPenempatanEvaluasiJabatan() {
-		List<Map<String, Object>> result = new ArrayList<>();
-		List<Integer> listIdPegawai = new ArrayList<>();
-
-		List<Map<String, Object>> data = nilaiKelompokJabatanDao
+		List<Map<String, Object>> result = nilaiKelompokJabatanDao
 				.findPenempatanEvaluasiJabatan(Arrays.asList(Master.KategoryPegawai.REMUN));
 
-		if (CommonUtil.isNotNullOrEmpty(data)) {
-			for (Map<String, Object> map : data) {
-				if (!listIdPegawai.contains(map.get("idPegawai"))) {
-					listIdPegawai.add(Integer.valueOf(map.get("idPegawai").toString()));
-				}
-			}
-
-			for (Integer idPegawai : listIdPegawai) {
-				for (Map<String, Object> map : data) {
-					if (map.get("idPegawai").equals(idPegawai)) {
-						result.add(map);
-						break;
-					}
-				}
-			}
-		}
-
 		return result;
 	}