From fea9a3dfbb66f9717f9bb981cc045efc68d5fc03 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 29 九月 2022 11:04:40 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java               |    5 +++--
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java                  |    4 ++--
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java |    4 ++--
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java          |    2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 066bcf7..1adaf19 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -8,6 +8,7 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
 import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
 import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -101,7 +102,7 @@
 @Slf4j
 @RestController
 @RequestMapping("/")
-public class CommunityApi {
+public class CommunityApi extends BaseController {
     @Resource
     public ComMngPopulationDAO comMngPopulationDAO;
     @Resource
@@ -2332,7 +2333,7 @@
      */
     @GetMapping("/eventgrid/community/list")
     public R getCommunityLists() {
-        return comActService.getCommunityLists();
+        return comActService.getCommunityLists(this.getAppId());
     }
 
     /**
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..22dfedb 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"
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java
index b0c6d8a..ead5cbf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java
@@ -78,7 +78,7 @@
      * 
      * @return 社区列表
      */
-    R getCommunityLists();
+    R getCommunityLists(String appId);
 
     /**
      * 查询西区社区列表
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
index 5c4f4f1..b7a54f8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -223,8 +223,8 @@
      * @return 社区列表
      */
     @Override
-    public R getCommunityLists() {
-        return R.ok(this.comActDAO.getCommunityLists());
+    public R getCommunityLists(String appId) {
+        return R.ok(this.comActDAO.getCommunityLists(appId));
     }
 
     @Override

--
Gitblit v1.7.1