From 7ed6a44af585ea459397ab09f68d5dd732715673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 30 Jan 2023 17:44:23 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=8B=A0=EC=95=8C=EB=9E=8C=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.=20=EC=88=98=EC=8B=A0=EC=95=8C=EB=9E=8C=20?=
 =?UTF-8?q?=EB=85=B8=EC=B6=9C=20=EA=B0=AF=EC=88=98=20=EB=B3=80=EA=B2=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dbnt/faisp/config/BaseController.java   | 3 +--
 src/main/java/com/dbnt/faisp/config/FaispInterceptor.java | 1 +
 src/main/resources/templates/login/dashboard.html         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr class="alarmTr" th:each="alarm:${alarmList}">
+                    <tr class="alarmTr" th:each="alarm:${dashboardAlarmList}">
                       <input type="hidden" class="alarmKey" th:value="${alarm.alarmKey}">
                       <input type="hidden" class="userSeq" th:value="${alarm.userSeq}">
                       <td>