From a1b61f5e7344f2581ed70930f6c4613eea4b1406 Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Fri, 10 Sep 2021 15:18:23 +0900
Subject: [PATCH] =?UTF-8?q?SM=5FDEPT=20=ED=85=8C=EC=9D=B4=EB=B8=94?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/nlib/cmm/NotificationDAO_SQL.xml   |  3 ++-
 .../mapper/nlib/user/LoginDAO_SQL.xml         | 12 ++++-----
 .../jsp/nlib/cmm/listNotifications.jsp        | 26 +++++++++----------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/NotificationDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/NotificationDAO_SQL.xml
index 82c56d18..e3fcfe73 100644
--- a/src/main/resources/egovframework/mapper/nlib/cmm/NotificationDAO_SQL.xml
+++ b/src/main/resources/egovframework/mapper/nlib/cmm/NotificationDAO_SQL.xml
@@ -38,7 +38,8 @@
     
     <select id="selectNotification" parameterType="NotificationVO" resultType="NotificationVO">
         <![CDATA[
-        SELECT *
+        SELECT A.*
+             , IF(A.READ_DD IS NULL, 'N', 'Y') AS READ_YN
         FROM SM_NOTIFICATION A 
         WHERE A.RECV_USER_ID = #{recvUserId}
         AND A.NOTI_ID = #{notiId}
diff --git a/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml
index 5c7a4b1b..3ed50e85 100644
--- a/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml
+++ b/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml
@@ -44,10 +44,10 @@
  	</select>
  	
  	<select id="selectCouncilInfoByDnsHost" parameterType="String" resultType="HashMap">
-		SELECT JOIN_COUNCIL_CD AS councilCd
-		     , JOIN_COUNCIL_NM AS councilNm
-		FROM UAC_CLTR_DB.TMP_MB_SITE_INFO
-		WHERE JOIN_COUNCIL_DNS_HOST = #{councilDnsHost}
+		SELECT ORG_CD AS councilCd
+		     , DEPT_ABBR_NM AS councilNm
+		FROM SM_DEPT
+		WHERE DOMAIN_HOST_NM = #{councilDnsHost}
         LIMIT 1         
     </select>
     
@@ -105,8 +105,8 @@
             ,NOW()
             ,#{joinCouncilCd}
             ,'N'
-		FROM UAC_CLTR_DB.TMP_MB_SITE_INFO
-		WHERE JOIN_COUNCIL_CD = #{joinCouncilCd}
+		FROM SM_DEPT 
+		WHERE ORG_CD = #{joinCouncilCd}
 		AND NOT EXISTS (
 		    SELECT MB_SITE_ID
 		    FROM MB_SITE S 
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/listNotifications.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/listNotifications.jsp
index 40e6346a..a8a0575c 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/listNotifications.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/listNotifications.jsp
@@ -44,7 +44,8 @@
  <script src="/nlib/js/jsgrid/nlib-jsgrid.js"></script>
 
  <script type="text/javaScript" language="javascript">
-
+ var GRID_INDEX_OF_READYN = 5;
+ 
  $( document ).ready(function() {
      
      //=======================================================
@@ -63,8 +64,6 @@
                  var pageIndex = ( filter && filter.pageIndex ? filter.pageIndex : $("#pageIndex").val());
                  var pageSize  = ( filter && filter.pageSize  ? filter.pageSize  : $("#pageSize").val());
                  
-                 alert("page index : " + pageIndex + ", " + pageSize);
-
                  $("#pageIndex").val(pageIndex);
 
                  var inputData = {
@@ -158,22 +157,23 @@
          var jsonObj = JSON.parse(response);
          $("#jsGrid").find('table tr.answer').remove();
          //alert("DDDDDDDD remove = " + $("#jsGrid")[0].scrollHeight);
-         $selectedRow.after("<tr class='answer'><td colspan='3'>" + jsonObj.content
-                 + "<br/>" + jsonObj.content
-                 + "<br/>" + jsonObj.content
-                 + "<br/>" + jsonObj.content
-                 + "<br/>" + jsonObj.content
-                 + "<br/>readYn=" + jsonObj.readYn
-                 + "<br/>regDd=" + jsonObj.regDd
+         
+        $("#jsGrid").jsGrid("rowByItem", $selectedRow).data("JSGridItem")["readYn"] = jsonObj.data.readYn;
+        $selectedRow.find('td').eq(GRID_INDEX_OF_READYN).text(jsonObj.data.readYn);
+        
+        $selectedRow.after("<tr class='answer'><td colspan='7'>" + jsonObj.data.content
+                 + "<br/>" + jsonObj.data.content
+                 + "<br/>" + jsonObj.data.content
+                 + "<br/>" + jsonObj.data.content
+                 + "<br/>알림확인여부=" + jsonObj.data.readYn
+                 + "<br/>알림일자=" + jsonObj.data.regDd
                  + "</td></tr>");
-         //alert("DDDDDDDD add = " + $("#jsGrid")[0].scrollHeight);
-         //$("#jsGrid").find('table.jsgrid-table.jsgrid-grid-body').height($("#jsGrid").find('table.jsgrid-table')[0].scrollHeight + 100);
      });
      
      $("#jsGrid").closest('.ui-jqgrid-bdiv').width($("#jsGrid").closest('.ui-jqgrid-bdiv').width() + 1);
      
  }
-
+ 
  // 그리드 데이터 조회 호출 
  function fn_searchArticle(pageSize, pageIndex) {
      $("#jsGrid").jsGrid("search"