From c9e45a964c77695ab453071e9cbe4b943843d6b4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 15 一月 2022 15:34:21 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
index 0d04a87..87f0c2a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -52,6 +52,8 @@
 
         "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id = ${comActActivityVO.communityId} " + " </if> "
         +
+        "<if test='comActActivityVO.areaCode !=null '>" + "AND ca.area_code = ${comActActivityVO.areaCode} " + " </if> "
+        +
 
         "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>"
         + " and a.activity_name like concat(#{comActActivityVO.activityName},'%')   " + " </if> "

--
Gitblit v1.7.1