From 661c2dd5da464d8350d6fab1259e67b7b4828e90 Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Fri, 27 Jan 2023 09:53:37 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=EC=99=B8=EC=82=AC=EC=88=98=EC=82=AC?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=A1=B0=EA=B1=B4=EC=88=98=EC=A0=95=2094,?=
 =?UTF-8?q?95,96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boardInvestigation/IvsgtController.java   |  3 +-
 .../majorStatus/MajorStatusController.java    |  2 --
 .../BoardInvestigationMapper.xml              |  4 +++
 .../mybatisMapper/MajorStatusMapper.xml       |  6 ----
 .../ivsgt/majorStatus/majorStatusPage.html    | 30 ++++++-------------
 5 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java
index b3145387..499c795d 100644
--- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java
+++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java
@@ -33,7 +33,8 @@ public class IvsgtController {
 
         mav.addObject("accessAuth", accessAuth);
         mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
-
+        
+        boardInvestigation.setDownOrganCdList(loginUser.getDownOrganCdList());
         boardInvestigation.setQueryInfo();
         mav.addObject("boardInvestigationList", boardInvestigationService.selectBoardInvestigationList(boardInvestigation));
         boardInvestigation.setContentCnt(boardInvestigationService.selectBoardInvestigationListCnt(boardInvestigation));
diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java
index 86924985..b1e6c4ef 100644
--- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java
+++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java
@@ -40,9 +40,7 @@ public class MajorStatusController {
         mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
         mav.addObject("searchParams", majorStatus);
 
-        majorStatus.setDownOrganCdList(loginUser.getDownOrganCdList());
         majorStatus.setQueryInfo();
-
         mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus));
         majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus));
         majorStatus.setPaginationInfo();
diff --git a/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml b/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml
index 5a4d7a29..38925f88 100644
--- a/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml
+++ b/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml
@@ -6,6 +6,10 @@
 <mapper namespace="com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.mapper.BoardInvestigationMapper">
     <sql id="selectBoardInvestigationListWhere">
     <where>
+        and a.wrt_organ in
+        <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
+          #{organCd}
+        </foreach>
         <if test='ivsgtType != null and ivsgtType != ""'>
             AND ivsgt_type = #{ivsgtType}
         </if>
diff --git a/src/main/resources/mybatisMapper/MajorStatusMapper.xml b/src/main/resources/mybatisMapper/MajorStatusMapper.xml
index bb24d6f1..4df82611 100644
--- a/src/main/resources/mybatisMapper/MajorStatusMapper.xml
+++ b/src/main/resources/mybatisMapper/MajorStatusMapper.xml
@@ -26,12 +26,6 @@
             <if test='endDate != null and endDate != ""'>
                 and a.wrt_dt &lt;= #{endDate}::date+1
             </if>
-
-            and a.wrt_organ in
-                   <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
-                       #{organCd}
-                    </foreach>
-
         </where>
     </sql>
 
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
index 4c782144..b0260759 100644
--- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
+++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
@@ -67,36 +67,24 @@
                                             <table class="table table-sm table-hover table-bordered">
                                                 <thead>
                                                 <tr class="table-secondary">
-<!--                                                    <th></th>-->
-                                                    <th>종류</th>
+                                                    <th width="5%">순번</th>
+                                                    <th width="10%">작성일시</th>
+                                                    <th width="10%">종류</th>
                                                     <th>제목</th>
-                                                    <th>관서</th>
-                                                    <th>부서</th>
-                                                    <th>계급</th>
-                                                    <th>작성자</th>
-                                                    <th>작성일시</th>
-                                                    <th>첨부파일</th>
+                                                    <th>내용</th>
+                                                    <th width="10%">첨부파일</th>
                                                 </tr>
                                                 </thead>
                                                 <tbody class="table-group-divider">
-                                                <tr class="tr" th:each="major:${majorList}">
+                                                <tr class="tr" th:each="major, cnt:${majorList}">
                                                     <input type="hidden" class="majorKey" th:value="${major.majorKey}">
-<!--                                                    <td><input type="checkbox" class="trChkBox"></td>-->
+                                                    <td th:text="${cnt.count}"></td>
+                                                    <td th:text="${#temporals.format(major.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                                                     <th:block th:each="commonCode:${session.commonCode.get('MST')}">
                                                     <td th:if="${major.majorType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                                                     </th:block>
                                                     <td th:text="|${major.contentStatus eq 'DST001'?'[임시]':''}${major.contentTitle}|"></td>
-                                                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                                                        <td th:if="${major.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                                                    </th:block>
-                                                    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                                                        <td th:if="${major.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                                                    </th:block>
-                                                    <th:block th:each="commonCode:${session.commonCode.get('JT')}">
-                                                        <td th:if="${major.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                                                    </th:block>
-                                                    <td th:text="${major.wrtUserNm}"></td>
-                                                    <td th:text="${#temporals.format(major.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                                                    <td th:utext="${major.contentInfo}"></td>
                                                     <td th:text="${major.fileCnt eq null?'파일 없음':#strings.concat(major.fileCnt,' 건')}"></td>
                                                 </tr>
                                                 </tbody>