From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +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/api/NeighborApi.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
index 4ac3112..94d2865 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -41,6 +41,16 @@
}
/**
+ * 分页查询可关联清单列表
+ * @param neighborCircleAppDTO
+ * @return
+ */
+ @PostMapping("pageRelationList")
+ public R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ return comActNeighborCircleService.pageRelationList(neighborCircleAppDTO);
+ }
+
+ /**
* 分页查询邻里圈列表
*
* @param neighborCircleAppDTO
@@ -428,7 +438,9 @@
* @return
*/
@GetMapping("/selectCount")
- public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone){
- return this.comActNeighborCircleService.selectCount(type,phone);
+ public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId){
+ return this.comActNeighborCircleService.selectCount(type,phone,communityId);
}
+
+
}
--
Gitblit v1.7.1