Compare commits
No commits in common. "c44d5799f3832ed17235c6810a03159f3a4de743" and "960b9af31456e3bb3b0bcefa0648f62d8def3ec1" have entirely different histories.
c44d5799f3
...
960b9af314
@ -4418,18 +4418,6 @@ 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;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user