From b2d178b267f0eaa12a3d1fd6da8928a9ef5d366b Mon Sep 17 00:00:00 2001
From: zhangtiansen <1292933220@qq.com>
Date: 星期三, 19 十月 2022 22:56:34 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml                                   |    8 +++++++-
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java |    4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index 9f64322..b69703e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -1040,12 +1040,12 @@
 
     @Override
     public R listStreetScreen() {
-        return R.ok(comStreetDAO.selectList(new QueryWrapper<ComStreetDO>().eq("app_id", "wx0cef797390444b75")));
+        return R.ok(comStreetDAO.selectList(new QueryWrapper<ComStreetDO>().eq("app_id", "wx0cef797390444b75").in("name",("大宝鼎街道"),("格里坪镇"),("河门口街道"),("清香坪街道"),("陶家渡街道"),("玉泉街道"))));
     }
 
     @Override
     public R listCommunityScreen() {
-        return R.ok(comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAppId, "wx0cef797390444b75")));
+        return R.ok(comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAppId, "wx0cef797390444b75").in(ComActDO::getStreetId,("1552661139563876352"),("1552661132500668416"),("1552661143879815168"),("1552661138704044032"),("1552661135428292608"),("1552661136451702784"))));
     }
 
     public String typeToName(Integer type){
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml
index c3fea57..1043544 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml
@@ -56,13 +56,19 @@
             <if test="level != null ">
             AND level=#{level}
                 <if test="level == 2">
-                    AND industry_center_id=#{id}
+                       <if test="id != null">
+                           AND industry_center_id=#{id}
+                       </if>
                 </if>
                 <if test="level == 3">
+                    <if test="id != null">
                     AND street_id=#{id}
+                    </if>
                 </if>
                 <if test="level == 4">
+                    <if test="id != null">
                     AND community_id=#{id}
+                    </if>
                 </if>
             </if>
             <if test="range != null and range != ''">

--
Gitblit v1.7.1