Update PegawaiServiceImpl.java
Fix conflict fitur mitra rsab dan peserta didik fellowship
This commit is contained in:
parent
16fd2d7eed
commit
59984f64c2
@ -889,7 +889,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
|
|||||||
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
|
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
|
||||||
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja,
|
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja,
|
||||||
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"),
|
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"),
|
||||||
Collections.singletonList(Master.KategoryPegawai.PESERTA_DIDIK));
|
splitDataSettingDatafixed("listIdKategoriPesertaDidik"));
|
||||||
|
|
||||||
for (Map<String, Object> map : resultModel) {
|
for (Map<String, Object> map : resultModel) {
|
||||||
Map<String, Object> usernames = new HashMap<>();
|
Map<String, Object> usernames = new HashMap<>();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user