From 131aa1302bd7edab443f01800e322602d1b269ea Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 29 四月 2021 16:27:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
index 812dea0..45b7f21 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -71,11 +71,12 @@
             "com_act_neighbor_circle nc\n" +
             "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" +
             "<where>"+
-            "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent.trim() != &quot;&quot;'>" +
-            "and t.release_content LIKE concat('%',#{neighborCircleAdminDTO.releaseContent}, '%' )  " +
+            "nc.community_id = #{neighborCircleAdminDTO.communityId}  \n"+
+            "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != &quot;&quot;'>" +
+            "and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%')  \n" +
             " </if> " +
             "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" +
-            "and t.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt}  " +
+            "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt}  \n" +
             " </if> " +
             "</where>"+
             "order by nc.`status` asc,nc.create_at desc " +

--
Gitblit v1.7.1