Compare commits
No commits in common. "e6eeee47a2f56ca94f250d7a000a659dacbef72c" and "ff5ee160fb1369879944978faccd8ccba19982dc" have entirely different histories.
e6eeee47a2
...
ff5ee160fb
@ -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