Merge branch 'dev/base' into dev/integrasi/minio

Penyesuaian pilihan pegawai rangkap jabatan di subunit kerja yang sama dan validasi hak aksesnya di monitoring absensi

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java

@@ -4418,6 +4418,18 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 					.collect(Collectors.toList()));
 		}
 
+		if (CommonUtil.isNullOrEmpty(result)) {
+			List<Map<String, Object>> listIncludedResult = monitoringAbsenDao.getDataPegawaiRev(idUnitKerja,
+					idSubUnitKerja, idPegawaiLogin, splitDataSettingDatafixed("idMeninggalKeluarPindah"));
+			List<Integer> listId = new ArrayList<>();
+			for (Map<String, Object> map : result) {
+				listId.add(Integer.parseInt(map.get("id").toString()));
+			}
+			if (!listId.contains(listIncludedResult.get(0).get("id"))) {
+				result.add(listIncludedResult.get(0));
+			}
+		}
+
 		return result;
 	}