From 20df991f64129231f9e5de9b2c421700fda1c1db 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, 28 Mar 2022 11:15:31 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=ED=9A=8D=EB=93=9D=20=EC=BF=BC?=
 =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kcg/faics/board/vo/BoardSearchVO.java     |  3 --
 .../kcg/faics/cmmn/web/CommonController.java  | 21 +++++-----
 .../sqlmapper/mappers/board/board.xml         | 41 +++++++++----------
 3 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/main/java/kcg/faics/board/vo/BoardSearchVO.java b/src/main/java/kcg/faics/board/vo/BoardSearchVO.java
index b5e810e..35c580b 100644
--- a/src/main/java/kcg/faics/board/vo/BoardSearchVO.java
+++ b/src/main/java/kcg/faics/board/vo/BoardSearchVO.java
@@ -72,9 +72,6 @@ public class BoardSearchVO extends BaseSearchVO {
 	 * @param id 를 설정한다.
 	 */
 	public void setCategory(String category) {
-		if (category == null || category.equals("")) {
-			category = " ";
-		}
 		this.category = category;
 	}
 
diff --git a/src/main/java/kcg/faics/cmmn/web/CommonController.java b/src/main/java/kcg/faics/cmmn/web/CommonController.java
index 44399ea..56e144f 100644
--- a/src/main/java/kcg/faics/cmmn/web/CommonController.java
+++ b/src/main/java/kcg/faics/cmmn/web/CommonController.java
@@ -91,6 +91,7 @@ public class CommonController {
     	if (EgovUserDetailsHelper.isAuthenticated()) {
     		BoardSearchVO searchVO = new BoardSearchVO();
     		searchVO.setRecordCountPerPage(5);
+        searchVO.setCategory(null);
     		
     		/* 내실적 조회 리스트 */
     		LoginUserVO loginUserVO = UserUtil.getMemberInfo();
@@ -115,25 +116,25 @@ public class CommonController {
     		List<ReportVO> reportList = judgeService.selectMyList(reportSearchVO);
     		model.addAttribute("reportList", reportList);
     		
-    		/* 공지사항 리스트 */
-    		searchVO.setId("notice");
+        /* 공지사항 리스트 */
+        searchVO.setId("notice");
         List<BoardVO> noticeList = boardService.selectList(searchVO);
         model.addAttribute("noticeList", noticeList);
 
-          /* 게시판 리스트 */
-          searchVO.setId("bbs");
+        /* 게시판 리스트 */
+        searchVO.setId("bbs");
         List<BoardVO> bbsList = boardService.selectList(searchVO);
         model.addAttribute("bbsList", bbsList);
 
-          /* 자료실 리스트 */
-          searchVO.setId("data");
+        /* 자료실 리스트 */
+        searchVO.setId("data");
         List<BoardVO> dataList = boardService.selectList(searchVO);
         model.addAttribute("dataList", dataList);
 			
-        	return "main.tiles";
-        } else {
-        	return "common/login";
-        }
+        return "main.tiles";
+      } else {
+        return "common/login";
+      }
     }
 	
 	/**
diff --git a/src/main/resources/sqlmapper/mappers/board/board.xml b/src/main/resources/sqlmapper/mappers/board/board.xml
index 689f4dc..8047d3a 100644
--- a/src/main/resources/sqlmapper/mappers/board/board.xml
+++ b/src/main/resources/sqlmapper/mappers/board/board.xml
@@ -19,28 +19,27 @@
                 SELECT
                   *
                 FROM H3_BD_${id}_LIST BBS
-                WHERE  1 = 1
-				        <choose>
-                  <when test='category == " " and id == "stat_bbs"'>
-                  </when>
-                  <otherwise>
+                <where>
+                  <if test='category != null'>
                     AND	BD_CATEGORY = #{category}
-                  </otherwise>
-				        </choose>
-					
-                <if test="searchKeyword != null and searchKeyword != ''">
-                  <choose>
-                    <when test="searchCondition == 0">
-                      AND	BD_DATA1 LIKE '%' || #{searchKeyword} || '%'
-                    </when>
-                    <when test="searchCondition == 1">
-                      AND	BD_NAME LIKE '%' || #{searchKeyword} || '%'
-                    </when>
-                    <when test="searchCondition == 2">
-                      AND	BD_SUBJECT LIKE '%' || #{searchKeyword} || '%'
-                    </when>
-                  </choose>
-                </if>
+                  </if>
+                  <!--<if test='id != "stat_bbs"'>
+                    AND	BD_CATEGORY = #{category}
+                  </if>-->
+                  <if test="searchKeyword != null and searchKeyword != ''">
+                    <choose>
+                      <when test="searchCondition == 0">
+                        AND	BD_DATA1 LIKE '%' || #{searchKeyword} || '%'
+                      </when>
+                      <when test="searchCondition == 1">
+                        AND	BD_NAME LIKE '%' || #{searchKeyword} || '%'
+                      </when>
+                      <when test="searchCondition == 2">
+                        AND	BD_SUBJECT LIKE '%' || #{searchKeyword} || '%'
+                      </when>
+                    </choose>
+                  </if>
+                </where>
 		            ORDER BY
                   BBS.BD_NOTICE DESC,
                   BBS.BD_GROUP_SEQ DESC,