From 04d9e4695d0d9fcf98f7153c57c60a611c858c5b Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Tue, 27 Sep 2022 13:43:38 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=EB=AF=BC=EA=B0=84=ED=86=B5=EC=97=AD?=
 =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95=EA=B6=8C=ED=95=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dbnt/faisp/translator/TranslatorController.java   | 4 ++++
 .../dbnt/faisp/translator/mapper/TranslatorMapper.java    | 3 ++-
 .../dbnt/faisp/translator/service/TranslatorService.java  | 4 ++++
 src/main/resources/mybatisMapper/TranslatorMapper.xml     | 8 ++++++++
 src/main/resources/templates/translator/translator.html   | 8 ++------
 .../templates/translator/translatorCareerModal.html       | 6 +++---
 .../templates/translator/translatorEditModal.html         | 2 +-
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java
index 6c660793..db1b2e4f 100644
--- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java
+++ b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java
@@ -74,6 +74,8 @@ public class TranslatorController {
     ModelAndView mav = new ModelAndView("translator/translatorEditModal");
     //메뉴권한 확인
     String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth();
+    mav.addObject("wrtId", translatorSevice.selectTrFristId(translator.getTranslatorKey()));
+    mav.addObject("userId", loginUser.getUserId());
     mav.addObject("trInfo", translatorSevice.selectTranslatorView(translator));
     mav.addObject("accessAuth", accessAuth);
     return mav;
@@ -109,6 +111,8 @@ public class TranslatorController {
     mav.addObject("policeCrr", translatorSevice.selectMaritimePoliceCareer(translatorCrr));
     mav.addObject("anotherCrr", translatorSevice.selectAnotherOrganizationCareer(translatorCrr));
     mav.addObject("trKey", translatorCrr.getTranslatorKey());
+    mav.addObject("wrtId", translatorSevice.selectTrFristId(translatorCrr.getTranslatorKey()));
+    mav.addObject("userId", loginUser.getUserId());
     mav.addObject("accessAuth", accessAuth);
     return mav;
   }
diff --git a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java b/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java
index 6ae4bffa..3856fb81 100644
--- a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java
+++ b/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java
@@ -2,7 +2,6 @@ package com.dbnt.faisp.translator.mapper;
 
 import com.dbnt.faisp.translator.model.Translator;
 import com.dbnt.faisp.translator.model.TranslatorCrr;
-import com.dbnt.faisp.userInfo.model.UserInfo;
 import com.dbnt.faisp.util.ParamMap;
 
 import org.apache.ibatis.annotations.Mapper;
@@ -28,4 +27,6 @@ public interface TranslatorMapper {
 
 	List<ParamMap> selectTranslatorListEx(Translator translator);
 
+	String selectTrFristId(int translatorKey);
+
 }
diff --git a/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java b/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java
index 45bcbff1..427e0393 100644
--- a/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java
+++ b/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java
@@ -140,4 +140,8 @@ public class TranslatorService {
 		return translatorMapper.selectTranslatorListEx(translator);
 	}
 
+	public String selectTrFristId(int translatorKey) {
+		return translatorMapper.selectTrFristId(translatorKey);
+	}
+
 }
diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml
index cf46fc4d..8766c208 100644
--- a/src/main/resources/mybatisMapper/TranslatorMapper.xml
+++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml
@@ -312,5 +312,13 @@
      </if>
 	order by translator_key desc
   </select>
+  
+  <select id="selectTrFristId" resultType="String" parameterType="int">
+	    select wrt_nm 
+		from translator_info
+		where translator_key = #{translatorKey}
+		order by version_no asc
+		limit 1
+  </select>
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html
index f7bd937f..3c86e5a6 100644
--- a/src/main/resources/templates/translator/translator.html
+++ b/src/main/resources/templates/translator/translator.html
@@ -133,12 +133,8 @@
                        <td th:text="${trInfo.trEdu}"></td>
                        <td th:text="${trInfo.trCft}"></td>
                        <td th:text="${trInfo.trVisa}"></td>
-                       <th:block th:if="${trInfo.dmlYn == 'O'}">
-                       <td>●</td>
-                       </th:block>
-                       <th:block th:if="${trInfo.dmlYn == 'X'}">
-                       <td></td>
-                       </th:block>
+                       <td th:if="${trInfo.dmlYn == 'O'}">●</td>
+                       <td th:unless="${trInfo.dmlYn == 'O'}"></td>
                        <td th:text="${trInfo.aptDt}"></td>
                        <td th:text="${trInfo.trPhone}"></td>
                       </tr>
diff --git a/src/main/resources/templates/translator/translatorCareerModal.html b/src/main/resources/templates/translator/translatorCareerModal.html
index ccab8ffc..07b80bec 100644
--- a/src/main/resources/templates/translator/translatorCareerModal.html
+++ b/src/main/resources/templates/translator/translatorCareerModal.html
@@ -29,7 +29,7 @@
 	                      <td th:text="${crrInfo.tcDt}">ㅇ</td>
 	                      <td th:text="${crrInfo.contents}"></td>
 	                      <td th:text="${crrInfo.remark}"></td>
-	                      <td><button type="button" class="btn btn-danger m-0" id="deleteCareerBtn" th:onclick="|javascript:deleteCareerBtn('${crrInfo.careerSeq}','${crrInfo.translatorKey}')|" th:unless="${accessAuth eq 'ACC001'}">삭제</button></td>
+	                      <td><button type="button" class="btn btn-danger m-0" id="deleteCareerBtn" th:onclick="|javascript:deleteCareerBtn('${crrInfo.careerSeq}','${crrInfo.translatorKey}')|" th:if="${accessAuth eq 'ACC003'} or ${wrtId eq userId}">삭제</button></td>
                       </tr>
                       </tbody>
                     </table>
@@ -52,7 +52,7 @@
 	                      <td th:text="${crrInfo.tcDt}"></td>
 	                      <td th:text="${crrInfo.contents}"></td>
 	                      <td th:text="${crrInfo.remark}"></td>
-	                      <td><button type="button" class="btn btn-danger m-0" id="deleteCareerBtn" th:onclick="|javascript:deleteCareerBtn('${crrInfo.careerSeq}','${crrInfo.translatorKey}')|" th:unless="${accessAuth eq 'ACC001'}">삭제</button></td>
+	                      <td><button type="button" class="btn btn-danger m-0" id="deleteCareerBtn" th:onclick="|javascript:deleteCareerBtn('${crrInfo.careerSeq}','${crrInfo.translatorKey}')|" th:if="${accessAuth eq 'ACC003'} or ${wrtId eq userId}">삭제</button></td>
                       </tr>
                       </tbody>
                     </table>
@@ -61,7 +61,7 @@
               </div>
           </div>
           <div class="modal-footer">
-            <button type="button" class="btn btn-primary" id="crrInsertBtn" th:unless="${accessAuth eq 'ACC001'}">이력등록</button>
+            <button type="button" class="btn btn-primary" id="crrInsertBtn" th:if="${accessAuth eq 'ACC003'} or ${wrtId eq userId}">이력등록</button>
           </div>
         </div>
       </div>
diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html
index 9fdb84d5..5fe6520c 100644
--- a/src/main/resources/templates/translator/translatorEditModal.html
+++ b/src/main/resources/templates/translator/translatorEditModal.html
@@ -113,7 +113,7 @@
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-secondary" id="trDeleteBtn" th:unless="${accessAuth eq 'ACC001'}">해임</button>
-            <button type="button" class="btn btn-primary" id="updateBtn" th:unless="${accessAuth eq 'ACC001'}">수정</button>
+            <button type="button" class="btn btn-primary" id="updateBtn" th:if="${accessAuth eq 'ACC003'} or ${wrtId eq userId}">수정</button>
           </div>
          </form>
         </div>

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 2/2] =?UTF-8?q?=EA=B3=B5=ED=86=B5=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=ED=8C=90=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>