From 6ac0849d13ec2f178b2daa6cd3e63bbe9fdde596 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 21:22:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 81c70a7..fc49de0 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
@@ -44,9 +44,34 @@
             "SELECT * \n" +
             "FROM\n" +
             "com_act_message t where t.community_id=#{comActMessageVO.communityId}\n" +
+            "<if test='comActMessageVO.userAccount != null and comActMessageVO.userAccount.trim() != &quot;&quot;'>" +
+            " and t.user_account=#{comActMessageVO.userAccount} \n" +
+            " </if> " +
+            "<if test='comActMessageVO.userName != null and comActMessageVO.userName.trim() != &quot;&quot;'>" +
+            " and t.user_name=#{comActMessageVO.userName} \n" +
+            " </if> " +
             "<if test='comActMessageVO.userPhone != null and comActMessageVO.userPhone.trim() != &quot;&quot;'>" +
             " and t.user_phone=#{comActMessageVO.userPhone} \n" +
             " </if> " +
+            "<if test='comActMessageVO.msgContent != null and comActMessageVO.msgContent.trim() != &quot;&quot;'>" +
+            " and t.msg_content like concat('%',#{comActMessageVO.msgContent},'%') \n" +
+            " </if> " +
+            "<if test='comActMessageVO.status != null and comActMessageVO.status != 0'>" +
+            " and t.`status`=#{comActMessageVO.status} \n" +
+            " </if> " +
+            "<if test='comActMessageVO.ispublic != null and comActMessageVO.ispublic != 0'>" +
+            " and t.ispublic=#{comActMessageVO.ispublic} \n" +
+            " </if> " +
+            "<if test='comActMessageVO.sendtoUserName != null and comActMessageVO.sendtoUserName.trim() != &quot;&quot;'>" +
+            " and t.sendto_user_name=#{comActMessageVO.sendtoUserName} \n" +
+            " </if> " +
+            "<if test='comActMessageVO.publishAtBegin != null '>" +
+            "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