--no commit message

com.zrqx.talk/src/main/java/com/zrqx/talk/bg/mapper/TalkMapper.java

@@ -13,7 +13,7 @@ import com.zrqx.core.vo.talk.TalkListVO;
 
 public interface TalkMapper extends BaseMapper<Talk> {
 
-	@Select("<script>select * from talk where plateId=#{form.plateId} "
+	@Select("<script>select * from talk where 1 = 1 "
 			+ "<if test = '" + NOTBLANK + "(form.keyword)' >" 
 				+ "<if test = 'form.type==1' >"
 					+ "and theme like concat(#{form.keyword},'%') " 
@@ -22,14 +22,17 @@ public interface TalkMapper extends BaseMapper<Talk> {
 					+ "and authorName like concat(#{form.keyword},'%') " 
 				+ "</if>" 
 			+ "</if>" 
-			+ "<if test = 'form.status !=null' >" + "and status = #{form.status} " 
-			+ "</if>" + "<if test = '" + NOTBLANK+ "(form.startTime)' >" 
+			+ "<if test = 'form.status !=null' >" + "and status = #{form.status} " + "</if>"
+			+ "<if test = 'form.plateId !=null' >" + "and plateId = #{form.plateId} " + "</if>"
+			+ "<if test = 'form.plateId == null' >" + "and plateId > 2 " + "</if>"
+			+ "<if test = '" + NOTBLANK+ "(form.startTime)' >" 
 			+ "<![CDATA[" + "and publishDate >= #{form.startTime} " 
 			+ "]]>" 
 			+ "</if>" 
 			+ "<if test = '"
 			+ NOTBLANK 
 			+ "(form.endTime)' >" + "<![CDATA[" + "and publishDate <= #{form.endTime} " + "]]>" + "</if>"
+			+ " order by sortNum desc, publishDate desc "
 			+ "</script>")
 	List<TalkListVO> queryTalkList(@Param("form")QueryTalkForm form);