From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 18 三月 2025 22:11:24 +0800 Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/ISystemUserService.java | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 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 a7de19e..811936b 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,11 +2,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.panzhihua.common.model.vos.LoginUserInfoVO; 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.IdentityInformationVO; import com.panzhihua.sangeshenbian.warpper.SystemUserList; import com.panzhihua.sangeshenbian.warpper.SystemUserListVo; +import java.util.List; import java.util.Optional; /** @@ -20,10 +24,48 @@ * @param query * @return */ - IPage<SystemUserListVo> list(Integer accountLevel, SystemUserList query); + IPage<SystemUserListVo> list(SystemUser user, SystemUserList query); /** * 根据手机号码查询小程序用户在三个身边的上级角色用户 */ + Optional<SystemUser> getSystemUserAdminByPhone(String phone); + + /** + * 根据手机号码查询小程序用户在三个身边的用户 + */ Optional<SystemUser> getSystemUserByPhone(String phone); + /** + * 获取行政区划数据 + * + * @param pcode + * @return + */ + List<RegionVO> getRegion(String pcode); + + + /** + * 获取街道数据 + * + * @param areaCode + * @return + */ + List<RegionVO> getStreet(String areaCode); + + + /** + * 获取社区数据 + * + * @param streetId + * @return + */ + List<RegionVO> getCommunity(String streetId); + + /** + * 获取区县-街道-社区树 + * @param loginUserInfo + * @return + */ + List<RegionVO> getRegionTree(SystemUserVo loginUserInfo); + } -- Gitblit v1.7.1