From 38f1a806a4e1d8e1560f07a5a26b51cf6a4692be Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 17 三月 2025 10:57:57 +0800 Subject: [PATCH] 党员管理接口调试修改 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java index 63d59e7..1538dc0 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java @@ -11,6 +11,7 @@ import com.panzhihua.sangeshenbian.model.entity.SystemMenu; import com.panzhihua.sangeshenbian.model.entity.SystemRoleMenu; import com.panzhihua.sangeshenbian.model.entity.SystemUser; +import com.panzhihua.sangeshenbian.model.vo.RegionVO; import com.panzhihua.sangeshenbian.service.ISystemMenuService; import com.panzhihua.sangeshenbian.service.ISystemRoleMenuService; import com.panzhihua.sangeshenbian.service.ISystemUserService; @@ -22,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.util.ObjectUtils; @@ -38,6 +40,7 @@ * @Date 2025/2/18 22:30 */ @Api +@Slf4j @RestController @RequestMapping("/systemUser") public class SystemUserController extends BaseController { @@ -313,8 +316,8 @@ @ApiImplicitParam(name = "tier", value = "数据层级(2=区县,3=街道,4=社区)", required = true, dataType = "int"), }) @OperLog(operModul = "三个身边后台",operType = 0,businessType = "获取行政区划层级联动数据") - public R<List<Map<String, Object>>> getAdministrativeDivision(@PathVariable("id") String id, @PathVariable("tier") Integer tier){ - List<Map<String, Object>> list = new ArrayList<>(); + public R<List<RegionVO>> getAdministrativeDivision(@PathVariable("id") String id, @PathVariable("tier") Integer tier){ + List<RegionVO> list = new ArrayList<>(); //区县 if(2 == tier){ list = systemUserService.getRegion("510400"); @@ -327,6 +330,14 @@ if(4 == tier){ list = systemUserService.getCommunity(id); } + log.info("获取行政区划层级联动数据:{}", list); + return R.ok(list); + } + @GetMapping("/regionTree") + @ApiOperation(value = "获取区县-街道-社区树",tags = {"三个身边后台-人员管理"}) + public R<List<RegionVO>> regionTree(){ + SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian(); + List<RegionVO> list = systemUserService.getRegionTree(loginUserInfo); return R.ok(list); } } -- Gitblit v1.7.1