From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 6d610fe..3b47cab 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
@@ -79,10 +79,10 @@
@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}")
List<CommunitySwitchAllAppletsVO> getCommunityListByStreetId(@Param("streetId") Long streetId);
- @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName " +
+ @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 '%%' and cs.area_code = #{areaCode}")
+ "where ca.state = 0 and ca.name like concat('%',#{name},'%') <if test='areaCode !=null and areaCode !=""'> 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," +
--
Gitblit v1.7.1