From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.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/ComActDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
index a2d9b8a..29def6e 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
@@ -63,8 +63,8 @@
void updateAccountPassword(@Param("password") String password, @Param("account") String account,
@Param("communityId") Long communityId);
- @Select("select community_id,`name`,lng,lat from com_act where state = 0")
- List<EventGridCommunityAdminVO> getCommunityLists();
+ @Select("select community_id,`name`,lng,lat from com_act where state = 0 and app_id =#{appId}")
+ List<EventGridCommunityAdminVO> getCommunityLists(@Param("appId") String appId);
@Select("select ca.`name`,cmsap.province_name,cmsac.city_name,cmsad.district_name,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca \n"
+ "left join com_mng_struct_area_province as cmsap on cmsap.province_adcode = ca.province_code\n"
@@ -113,4 +113,6 @@
@Select("select name from com_pb_check_unit where id=#{id}")
String selectUnitName(@Param("id") Long id);
+ @Select("select community_id from com_act where street_id=#{id}")
+ List<Long> selectCommunityByStreetId(Long id);
}
--
Gitblit v1.7.1