From c40f8e3d2e08e108780091776437242528bf61d6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 20 七月 2022 17:44:56 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
index a74491c..ca3d735 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -41,7 +41,8 @@
 
     @Select("<script> " + "SELECT\n" + "c.community_id,\n" + "c.`name`,\n"
         + "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" + "FROM\n"
-        + "com_act c \n" + "ORDER BY\n" + "distance ASC"
+        + "com_act c \n" + " <where>" + "<if test='areaCode != null and areaCode.trim() != &quot;&quot;'>"
+        + "c.area_code = #{areaCode} \n" + " </if> " + " </where>" + "ORDER BY\n" + "distance ASC"
         + "<if test='lng != null and lng.trim() != &quot;&quot;'>" + " limit 100 " + " </if> " + "</script>")
     List<ComActVO> listCommunity(ComActVO comActVO);
 
@@ -51,6 +52,8 @@
     @Select("<script> " + "SELECT\n" + "a.* \n" + "FROM\n" + "com_act a \n" + " <where>"
         + "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != &quot;&quot;'>"
         + "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" + " </if> "
+        + "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != &quot;&quot;'>"
+        + "AND a.area_code = #{pageComActDTO.areaCode} \n" + " </if> "
         + "<if test='pageComActDTO.createAtBegin != null '>" + "AND a.create_at BETWEEN "
         + "#{pageComActDTO.createAtBegin} \n" + "AND #{pageComActDTO.createAtEnd}" + " </if> " + " </where>"
         + " order by a.create_at desc" + "</script>")
@@ -70,7 +73,7 @@
         + "left join com_street as cs on cs.street_id = ca.street_id\n" + "where ca.community_id = ${communityId}")
     ComPopulationActVO getPopulationActById(@Param("communityId") Long communityId);
 
-    @Select("select `name`,street_id from com_street order by area_code asc")
+    @Select("select `name`,street_id from com_street where area_code = #{areaCode}")
     List<StreetAllAppletsVO> getStreetList(String areaCode);
 
     @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca left join com_street as cs on cs.street_id = ca.street_id where ca.state = 0 and ca.street_id = #{streetId}")
@@ -79,16 +82,17 @@
     @Select("<script> select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName " +
             "from com_act as ca " +
             "left join com_street as cs on cs.street_id = ca.street_id " +
-            "where ca.state = 0 and ca.name like concat('%',#{name},'%') </script> ")
+            "where ca.state = 0 and ca.name like concat('%',#{name},'%') <if test='areaCode !=null and areaCode !=&quot;&quot;'> and cs.area_code = #{areaCode} </if> </script> ")
     List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("areaCode") String areaCode);
 
     @Select("SELECT   c.community_id,    c.`name`,    c.street_id,    cs.`name` as streetName," +
             "round( ST_Distance_Sphere ( Point ( #{communityDTO.longitude}, #{communityDTO.latitude} ), Point ( c.lng, c.lat ) )/ 1000, 2 ) AS distance  " +
             "FROM    com_act c     left join com_street as cs on cs.street_id = c.street_id  " +
+            "where cs.area_code = #{communityDTO.areaCode} " +
             "HAVING distance >= 0 and distance <= #{communityDTO.distance}   ORDER BY    distance ASC")
     List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
 
-    @Select("<script> select community_id,name,lng,lat from com_act  where state = 0  </script>")
+    @Select("<script> select community_id,name,lng,lat from com_act  where state = 0 <if test='areaCode !=null and areaCode !=&quot;&quot;'> and area_code = #{areaCode} </if> </script>")
     List<EventGridCommunityAdminVO> getWestCommunityLists(@Param("areaCode") String areCode);
 
     @Select("select account,plaintext_password as password from com_act where community_id = ${communityId}")

--
Gitblit v1.7.1