From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:15:59 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java
index 47aa3b2..e85dfb2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java
@@ -2,6 +2,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.controller.BaseController;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
@@ -18,7 +19,7 @@
@RestController
@RequestMapping("/switch/")
@Api(tags = {"切换社区模块"})
-public class CommunitySwitchApi {
+public class CommunitySwitchApi extends BaseController {
@Resource
private CommunityService communityService;
@@ -26,18 +27,19 @@
@ApiOperation(value = "查询所有社区", response = StreetAllAppletsVO.class)
@GetMapping("/list/noToken")
public R list() {
- return communityService.communitySwitchList();
+ return communityService.communitySwitchList(this.getAreaCode());
}
@ApiOperation(value = "根据名字搜索社区", response = CommunitySwitchAllAppletsVO.class)
@GetMapping("/search/noToken")
public R search(@RequestParam(value = "name") String name) {
- return communityService.communitySwitchSearchList(name);
+ return communityService.communitySwitchSearchList(name,this.getAreaCode());
}
@ApiOperation(value = "根据距离搜索社区", response = CommunitySwitchAllAppletsVO.class)
@PostMapping("/distance/noToken")
public R searchDistance(@RequestBody SearchCommunityDTO communityDTO) {
+ communityDTO.setAreaCode(this.getAreaCode());
return communityService.communitySwitchSearchDistanceList(communityDTO);
}
--
Gitblit v1.7.1