From 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 29 四月 2021 16:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
index d54ae34..fe07dd1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
@@ -42,8 +42,9 @@
@Select("<script> " +
"SELECT * \n" +
- "FROM\n" +
- "com_act_message t where t.community_id=#{comActMessageVO.communityId}\n" +
+ "FROM \n" +
+ " com_act_message t " +
+ " where t.community_id=#{comActMessageVO.communityId}\n" +
"<if test='comActMessageVO.userAccount != null and comActMessageVO.userAccount.trim() != ""'>" +
" and t.user_account=#{comActMessageVO.userAccount} \n" +
" </if> " +
@@ -69,6 +70,9 @@
"AND t.create_at BETWEEN #{comActMessageVO.publishAtBegin} \n" +
"AND #{comActMessageVO.publishAtEnd} \n" +
" </if> " +
+ "<if test='comActMessageVO.type != null and comActMessageVO.type !=0'>" +
+ " AND t.type=#{comActMessageVO.type} \n" +
+ " </if> " +
" order by create_at desc"+
"</script>")
IPage<PageComActMessageVO> pageMyCommunityMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
--
Gitblit v1.7.1