From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
index 0042cb5..a8ad7c9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
@@ -35,8 +35,10 @@
             "FROM\n" +
             "com_act_dyn d\n" +
             "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id \n" +
-            "WHERE\n" +
-            "d.community_id=#{comActDynVO.communityId}\n" +
+            "WHERE 1=1 \n" +
+            "<if test='comActDynVO.choice == 0 '>" +
+            "and d.community_id=#{comActDynVO.communityId}\n" +
+            " </if> " +
             "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>" +
             "AND d.title like concat(#{comActDynVO.title},'%')  \n" +
             " </if> " +

--
Gitblit v1.7.1