From 0fc9760cf60f30e070c9e1ddb39dff0fe0fb5f91 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 17 三月 2025 22:24:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/ISystemUserService.java | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/ISystemUserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/ISystemUserService.java index 876f198..47491eb 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/ISystemUserService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/ISystemUserService.java @@ -2,12 +2,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo; import com.panzhihua.sangeshenbian.model.entity.SystemUser; +import com.panzhihua.sangeshenbian.model.vo.RegionVO; import com.panzhihua.sangeshenbian.warpper.SystemUserList; import com.panzhihua.sangeshenbian.warpper.SystemUserListVo; import java.util.List; -import java.util.Map; import java.util.Optional; /** @@ -26,16 +27,19 @@ /** * 根据手机号码查询小程序用户在三个身边的上级角色用户 */ + Optional<SystemUser> getSystemUserAdminByPhone(String phone); + + /** + * 根据手机号码查询小程序用户在三个身边的用户 + */ Optional<SystemUser> getSystemUserByPhone(String phone); - - /** * 获取行政区划数据 * * @param pcode * @return */ - List<Map<String, String>> getRegion(String pcode); + List<RegionVO> getRegion(String pcode); /** @@ -44,7 +48,7 @@ * @param areaCode * @return */ - List<Map<String, String>> getStreet(String areaCode); + List<RegionVO> getStreet(String areaCode); /** @@ -53,5 +57,12 @@ * @param streetId * @return */ - List<Map<String, String>> getCommunity(String streetId); + List<RegionVO> getCommunity(String streetId); + + /** + * 获取区县-街道-社区树 + * @param loginUserInfo + * @return + */ + List<RegionVO> getRegionTree(SystemUserVo loginUserInfo); } -- Gitblit v1.7.1