Merge branch 'master' of http://192.168.0.157:3000/DBNT/FAICS

src/main/java/kcg/faics/board/vo/BoardSearchVO.java

@@ -34,7 +34,7 @@ public class BoardSearchVO extends BaseSearchVO {
 	private String id = "";
 	
 	/** 카테고리 이름 */
-	private String category = " ";
+	private String category = "";
 	
 	/** 카테고리 이름 */
 	private String searchCondition = "";
@@ -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;
 	}
 

src/main/resources/sqlmapper/mappers/board/board.xml

@@ -32,7 +32,7 @@
                             group by BF_BD_SEQ) file
                 on list.bd_seq = file.bf_bd_seq
     <where>
-      <if test='category != " " or id == "stat_bbs"'>
+      <if test='category != null and category != ""'>
         AND	BD_CATEGORY = #{category}
       </if>
       <if test="searchKeyword != null and searchKeyword != ''">
@@ -65,14 +65,10 @@
 			COUNT(*)
 		FROM 
 			H3_BD_${id}_LIST
-		WHERE 1=1
-			<choose>
-	            <when test='category == " " and id == "stat_bbs"'>
-				</when>
-	            <otherwise>
-					AND	BD_CATEGORY = #{category}
-				</otherwise>
-			</choose>
+		<where>
+			<if test='category != null and category != ""'>
+				AND	BD_CATEGORY = #{category}
+			</if>
 			<if test="searchKeyword != null and searchKeyword != ''">
 		        <choose>
 		            <when test="searchCondition == 0">
@@ -85,7 +81,8 @@
 						AND	BD_SUBJECT LIKE '%' || #{searchKeyword} || '%'
 					</when>
 				</choose>
-			</if>	
+			</if>
+		</where>
 	</select>
 	
 	<select id="Board.selectBoard" parameterType="boardVO" resultType="boardVO">

src/main/webapp/WEB-INF/jsp/stats/statsList.jsp

@@ -71,10 +71,10 @@
 <div class="tabs">
 	<ul>
 		<!-- 전체 -->
-		<c:if test="${searchVO.category eq ' '}">
+		<c:if test="${searchVO.category eq ''}">
 			<li class="selected"><a href="?id=${searchVO.id}&category="><spring:message code="stats.all" /></a></li>
 		</c:if>
-		<c:if test="${searchVO.category ne ' '}">
+		<c:if test="${searchVO.category ne ''}">
 			<li><a href="?id=${searchVO.id}&category="><spring:message code="stats.all" /></a></li>
 		</c:if>