Merge branch 'master' of http://192.168.0.157:3000/DBNT/FAICS
commit
a53ed90757
|
|
@ -72,9 +72,6 @@ public class BoardSearchVO extends BaseSearchVO {
|
||||||
* @param id 를 설정한다.
|
* @param id 를 설정한다.
|
||||||
*/
|
*/
|
||||||
public void setCategory(String category) {
|
public void setCategory(String category) {
|
||||||
if (category == null || category.equals("")) {
|
|
||||||
category = " ";
|
|
||||||
}
|
|
||||||
this.category = category;
|
this.category = category;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
group by BF_BD_SEQ) file
|
group by BF_BD_SEQ) file
|
||||||
on list.bd_seq = file.bf_bd_seq
|
on list.bd_seq = file.bf_bd_seq
|
||||||
<where>
|
<where>
|
||||||
<if test='category != " " or id == "stat_bbs"'>
|
<if test='category != null and category != ""'>
|
||||||
AND BD_CATEGORY = #{category}
|
AND BD_CATEGORY = #{category}
|
||||||
</if>
|
</if>
|
||||||
<if test="searchKeyword != null and searchKeyword != ''">
|
<if test="searchKeyword != null and searchKeyword != ''">
|
||||||
|
|
@ -65,14 +65,10 @@
|
||||||
COUNT(*)
|
COUNT(*)
|
||||||
FROM
|
FROM
|
||||||
H3_BD_${id}_LIST
|
H3_BD_${id}_LIST
|
||||||
WHERE 1=1
|
<where>
|
||||||
<choose>
|
<if test='category != null and category != ""'>
|
||||||
<when test='category == " " and id == "stat_bbs"'>
|
|
||||||
</when>
|
|
||||||
<otherwise>
|
|
||||||
AND BD_CATEGORY = #{category}
|
AND BD_CATEGORY = #{category}
|
||||||
</otherwise>
|
</if>
|
||||||
</choose>
|
|
||||||
<if test="searchKeyword != null and searchKeyword != ''">
|
<if test="searchKeyword != null and searchKeyword != ''">
|
||||||
<choose>
|
<choose>
|
||||||
<when test="searchCondition == 0">
|
<when test="searchCondition == 0">
|
||||||
|
|
@ -86,6 +82,7 @@
|
||||||
</when>
|
</when>
|
||||||
</choose>
|
</choose>
|
||||||
</if>
|
</if>
|
||||||
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="Board.selectBoard" parameterType="boardVO" resultType="boardVO">
|
<select id="Board.selectBoard" parameterType="boardVO" resultType="boardVO">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue