From 78bc358c8747a2ed5f7a90eb9f954c4c23f67d81 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Tue, 27 Sep 2022 17:57:27 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=ED=86=B5=EA=B2=8C=EC=8B=9C=ED=8C=90?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../publicBoard/PublicBoardController.java    |  1 -
 .../publicBoard/mapper/PublicBoardMapper.java |  1 +
 .../mybatisMapper/PublicBoardMapper.xml       | 39 +++++++++++--------
 .../resources/static/js/publicBoard/notice.js |  7 ++++
 .../static/js/publicBoard/publicBoard.js      |  7 ++++
 .../publicBoard/notice/noticePage.html        |  2 +-
 .../templates/publicBoard/qna/qnaPage.html    |  5 ++-
 7 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java b/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java
index ebf22e57..26bf4a38 100644
--- a/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java
+++ b/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java
@@ -83,7 +83,6 @@ public class PublicBoardController {
       publicBoard.setDownOrganCdList(loginUser.getDownOrganCdList());
       mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
     }
-    publicBoard.setUpOrganCdList(loginUser.getUpOrganCdList());
     mav.addObject("qnaList", publicBoardService.selectContentList(publicBoard));
     publicBoard.setContentCnt(publicBoardService.selectContentListCnt(publicBoard));
     publicBoard.setPaginationInfo();
diff --git a/src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java b/src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java
index 4c7f65e7..0188d86e 100644
--- a/src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java
+++ b/src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java
@@ -8,6 +8,7 @@ import java.util.List;
 @Mapper
 public interface PublicBoardMapper {
   List<PublicBoard> selectContentList(PublicBoard publicBoard);
+  List<PublicBoard> selectContentListWhere(PublicBoard publicBoard);
 
   Integer selectContentListCnt(PublicBoard publicBoard);
 }
diff --git a/src/main/resources/mybatisMapper/PublicBoardMapper.xml b/src/main/resources/mybatisMapper/PublicBoardMapper.xml
index 899b8ddf..5b2f0360 100644
--- a/src/main/resources/mybatisMapper/PublicBoardMapper.xml
+++ b/src/main/resources/mybatisMapper/PublicBoardMapper.xml
@@ -9,29 +9,34 @@
       <if test='publicType != null and publicType != ""'>
         and a.public_type = #{publicType}
       </if>
+      <if test="title != null and title != ''">
+        AND a.title LIKE CONCAT('%', #{title}, '%')
+      </if>
       <if test='startDate != null and startDate != ""'>
         and a.wrt_dt >= #{startDate}::date
       </if>
       <if test='endDate != null and endDate != ""'>
         and a.wrt_dt &lt;= #{endDate}::date
       </if>
-      and a.public_key in (
-        <if test="downOrganCdList != null">
-          select public_key from public_board where wrt_organ in
-          <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
-            #{organCd}
-          </foreach>
-        </if>
-        <if test="downOrganCdList != null and upOrganCdList != null">
-          union all
-        </if>
-        <if test="upOrganCdList != null">
-          select public_key from public_board where organ_chk = 'F' and wrt_organ in
-          <foreach collection="upOrganCdList" item="organCd" separator="," open="(" close=")">
-            #{organCd}
-          </foreach>
-        </if>
-      )
+      <if test="downOrganCdList != null or upOrganCdList != null">
+        and a.public_key in (
+          <if test="downOrganCdList != null">
+            select public_key from public_board where wrt_organ in
+            <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
+              #{organCd}
+            </foreach>
+          </if>
+          <if test="downOrganCdList != null and upOrganCdList != null">
+            union all
+          </if>
+          <if test="upOrganCdList != null">
+            select public_key from public_board where organ_chk = 'F' and wrt_organ in
+            <foreach collection="upOrganCdList" item="organCd" separator="," open="(" close=")">
+              #{organCd}
+            </foreach>
+          </if>
+        )
+      </if>
     </where>
   </sql>
   <select id="selectContentList" resultType="PublicBoard" parameterType="PublicBoard">
diff --git a/src/main/resources/static/js/publicBoard/notice.js b/src/main/resources/static/js/publicBoard/notice.js
index b1e16b51..f7207215 100644
--- a/src/main/resources/static/js/publicBoard/notice.js
+++ b/src/main/resources/static/js/publicBoard/notice.js
@@ -1,5 +1,12 @@
 let files = [];
 
+$(function(){
+  $("#dateSelectorDiv").datepicker({
+    format: "yyyy-mm-dd",
+    language: "ko"
+  });
+})
+
 $(document).on('click', '#addNoticeBtn', function (){
   getEditModal(null, "PLB001")
 })
diff --git a/src/main/resources/static/js/publicBoard/publicBoard.js b/src/main/resources/static/js/publicBoard/publicBoard.js
index 82d585a8..7774a93c 100644
--- a/src/main/resources/static/js/publicBoard/publicBoard.js
+++ b/src/main/resources/static/js/publicBoard/publicBoard.js
@@ -35,6 +35,13 @@ $(document).on('click', '#commentSaveBtn', function (){
   }
 })
 
+$(function(){
+  $("#dateSelectorDiv").datepicker({
+    format: "yyyy-mm-dd",
+    language: "ko"
+  });
+})
+
 $(document).on('click', '.childCommentBtn', function (){
   const childCommentDiv = $(this).parents(".commentRow").find(".childCommentDiv")
   childCommentDiv.show();
diff --git a/src/main/resources/templates/publicBoard/notice/noticePage.html b/src/main/resources/templates/publicBoard/notice/noticePage.html
index 3bdb6fd8..65a828c5 100644
--- a/src/main/resources/templates/publicBoard/notice/noticePage.html
+++ b/src/main/resources/templates/publicBoard/notice/noticePage.html
@@ -15,7 +15,7 @@
     <div class="row mx-0">
       <div class="col-12 card text-center">
         <div class="card-body">
-          <form method="get" th:action="@{/affairPlan/monthPlanPage}">
+          <form method="get" th:action="@{/publicBoard/noticePage}">
             <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
             <div class="row justify-content-between pe-3 py-1">
               <div class="col-auto">
diff --git a/src/main/resources/templates/publicBoard/qna/qnaPage.html b/src/main/resources/templates/publicBoard/qna/qnaPage.html
index 593074ab..008dbc3f 100644
--- a/src/main/resources/templates/publicBoard/qna/qnaPage.html
+++ b/src/main/resources/templates/publicBoard/qna/qnaPage.html
@@ -6,6 +6,7 @@
 <th:block layout:fragment="script">
   <script type="text/javascript" th:src="@{/js/publicBoard/publicBoard.js}"></script>
   <script type="text/javascript" th:src="@{/js/publicBoard/qna.js}"></script>
+  <script type="text/javascript" th:src="@{/js/common.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main class="pt-3">
@@ -15,7 +16,7 @@
     <div class="row mx-0">
       <div class="col-12 card text-center">
         <div class="card-body">
-          <form method="get" th:action="@{/affairPlan/monthPlanPage}">
+          <form method="get" th:action="@{/publicBoard/qnaPage}">
             <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
             <div class="row justify-content-between pe-3 py-1">
               <div class="col-auto">
@@ -116,7 +117,7 @@
                       </nav>
                     </div>
                     <div class="col-auto">
-                      <input type="button" class="btn btn-success" value="등록" id="addQnaBtn" sec:authorize="hasRole('ROLE_SUB_ADMIN')">
+                      <input type="button" class="btn btn-success" value="등록" id="addQnaBtn">
                     </div>
                   </div>
                 </div>