From 8d19fcb7c4e52ceb77d8f8e75c06ab0ba5962d40 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Thu, 4 May 2023 08:42:27 +0700 Subject: [PATCH] Update ReportingController.java Penerapan service login user saat cetak slip gaji --- .../controller/ReportingController.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java index 52ee8aa4..89e609ac 100644 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java +++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java @@ -7840,16 +7840,19 @@ public class ReportingController extends LocaleController } @RequestMapping("/slipGaji") - public ModelAndView getSlipGaji(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "idPegawai", required = true) Integer pegawaiId, + public ModelAndView getSlipGaji(ModelAndView m, + @RequestParam(value = "format", required = false) String format, @RequestParam(value = "bulan", required = true) Long bulan) { - Map data = reportService.defineSlipGajiDataSource(pegawaiId, bulan); List> dataSource = new ArrayList<>(); - dataSource.add(data); + LoginUser loginUser = loginUserService.getLoginUser(); + if (CommonUtil.isNotNullOrEmpty(loginUser)) { + Map data = reportService.defineSlipGajiDataSource(loginUser.getPegawai().getId(), bulan); + dataSource.add(data); + } m.addObject("dataSource", dataSource); - m.addObject("format", "pdf"); - if (format != null && !format.isEmpty()) - m.addObject("format", format); + m.addObject("format", format); + if (CommonUtil.isNullOrEmpty(format)) + m.addObject("format", "pdf"); return m; }