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/api/EventGridDataApi.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
index 0d9e81a..e73810c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
@@ -139,6 +139,29 @@
         return eventGridDataService.editGridDataByAdmin(eventGridDataDTO);
     }
 
+
+    /**
+     * 查询网格下所有网格员
+     * @param gridId
+     * @return
+     */
+    @PostMapping("/grid/member")
+    R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId){
+        return eventGridDataService.getGridMemberListsByGrid(gridId);
+    }
+
+    /**
+     * 查询网格下所有网格员
+     * @param communityId
+     * @return
+     */
+    @PostMapping("/communitygrid")
+    R getGridDataListByCommunity(@RequestParam("gridId") Long communityId){
+        return eventGridDataService.getGridDataListByCommunity(communityId);
+    }
+
+
+
     @PostMapping("/data/delete")
     public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){
         return eventGridDataService.deleteGridDataByAdmin(Ids);

--
Gitblit v1.7.1