diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java index d608bf5e..b449e215 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java @@ -1821,6 +1821,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ if (CommonUtil.isNotNullOrEmpty(jabatanFungsional)) { result.put("jabatanFungsional", jabatanFungsional); } + result.remove("jabatanFungsionalId"); } if (CommonUtil.isNotNullOrEmpty(result.get("jabatanInternalId"))) { Map jabatanInternal = jabatanDao @@ -1828,6 +1829,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ if (CommonUtil.isNotNullOrEmpty(jabatanInternal)) { result.put("jabatanInternal", jabatanInternal); } + result.remove("jabatanInternalId"); } if (CommonUtil.isNotNullOrEmpty(result.get("jabatanLamarId"))) { Map jabatanLamar = jabatanDao @@ -1835,6 +1837,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ if (CommonUtil.isNotNullOrEmpty(jabatanLamar)) { result.put("jabatanLamar", jabatanLamar); } + result.remove("jabatanLamarId"); } if (CommonUtil.isNotNullOrEmpty(result.get("jabatanStrukturalId"))) { Map jabatanStruktural = jabatanDao @@ -1842,6 +1845,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ if (CommonUtil.isNotNullOrEmpty(jabatanStruktural)) { result.put("jabatanStruktural", jabatanStruktural); } + result.remove("jabatanStrukturalId"); } if (CommonUtil.isNotNullOrEmpty(result.get("jenisKelaminId"))) { Map jenisKelamin = jenisKelaminDao @@ -1900,7 +1904,10 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ } if (CommonUtil.isNotNullOrEmpty(result.get("golonganPPPKId"))) { Optional byId = golonganPPPKDao.findById(result.get("golonganPPPKId").toString()); - byId.ifPresent(golonganPPPK -> result.put("golonganPPPK", golonganPPPK)); + byId.ifPresent(golonganPPPK -> { + result.put("golonganPPPK", golonganPPPK); + result.remove("golonganPPPKId"); + }); } if (CommonUtil.isNotNullOrEmpty(result.get("rekananId"))) { Map rekanan = rekananDao @@ -1908,6 +1915,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ if (CommonUtil.isNotNullOrEmpty(rekanan)) { result.put("rekanan", rekanan); } + result.remove("rekananId"); } if (CommonUtil.isNotNullOrEmpty(result.get("ruanganId"))) { Map ruangan = ruanganDao @@ -1915,6 +1923,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ if (CommonUtil.isNotNullOrEmpty(ruangan)) { result.put("ruangan", ruangan); } + result.remove("ruanganId"); } if (CommonUtil.isNotNullOrEmpty(result.get("shiftKerjaId"))) { Map shiftKerja = kelompokShiftDao @@ -1945,6 +1954,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ if (CommonUtil.isNotNullOrEmpty(typePegawai)) { result.put("typePegawai", typePegawai); } + result.remove("typePegawaiId"); } return result;