diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index b364eddb..fe6bade7 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -81,8 +81,7 @@ public class BaseController { alarm.setUserSeq(loginUser.getUserSeq()); alarm.setViewYn("N"); alarm.setRowCnt(7); - mav.addObject("alarmList", userAlarmService.selectAlarmList(alarm)); - mav.addObject("alarmListCnt", userAlarmService.selectAlarmListCnt(alarm)); + mav.addObject("dashboardAlarmList", userAlarmService.selectAlarmList(alarm)); FaRptBoard faRpt = new FaRptBoard(); faRpt.setActiveTab("receive"); diff --git a/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java b/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java index 159de783..00f0ad81 100644 --- a/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java +++ b/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java @@ -30,6 +30,7 @@ public class FaispInterceptor implements HandlerInterceptor { UserAlarm param = new UserAlarm(); param.setUserSeq((Integer) request.getSession().getAttribute("userSeq")); param.setViewYn("N"); + param.setRowCnt(15); param.setQueryInfo(); mav.addObject("alarmList", userAlarmService.selectAlarmList(param)); mav.addObject("alarmListCnt", userAlarmService.selectAlarmListCnt(param)); diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index 202fec47..3069c024 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -72,7 +72,7 @@
-