From 95d336192af530dae4a70d78fcd300048976395d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 19:10:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
index 06eb4e4..0780873 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
@@ -248,6 +248,18 @@
     }
 
     @Override
+    public R getGridMemberListsByGrid(Long gridId) {
+        List<EventGridMemberAdminVO> eventGridMemberAdminVOList = this.getBaseMapper().getGridMemberListsByGrid(gridId);
+        return R.ok(eventGridMemberAdminVOList);
+    }
+
+    @Override
+    public R getGridDataListByCommunity(Long communityId) {
+        List<EventGridDataAreaVO>  eventGridDataAreaVOList = this.getBaseMapper().getGridDataListByCommunity(communityId);
+        return R.ok(eventGridDataAreaVOList);
+    }
+
+    @Override
     public R deleteGridDataByAdmin(List<Long> Ids){
         Integer count = eventMapper.getEventCountByGridIds(Ids);
         if(count > 0){

--
Gitblit v1.7.1