From 9c2e0c9cad7d48014df7fdbe0a7292f86d95f3ae Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期六, 15 三月 2025 19:03:32 +0800 Subject: [PATCH] 1. --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java index 7faf0ca..75fab8d 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java @@ -6,14 +6,13 @@ import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.sangeshenbian.dao.SystemUserMapper; import com.panzhihua.sangeshenbian.model.entity.SystemUser; +import com.panzhihua.sangeshenbian.model.vo.RegionVO; import com.panzhihua.sangeshenbian.service.ISystemUserService; import com.panzhihua.sangeshenbian.warpper.SystemUserList; import com.panzhihua.sangeshenbian.warpper.SystemUserListVo; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Optional; /** @@ -43,7 +42,7 @@ * @return */ @Override - public Optional<SystemUser> getSystemUserByPhone(String phone) { + public Optional<SystemUser> getSystemUserAdminByPhone(String phone) { if (StringUtils.isBlank(phone)) { return Optional.empty(); } @@ -51,39 +50,48 @@ .eq(SystemUser::getPhone, phone).ne(SystemUser::getStatus, 3) .eq(SystemUser::getIsAdmin, 1).last("LIMIT 1").oneOpt(); } - - - - + + @Override + public Optional<SystemUser> getSystemUserByPhone(String phone) { + if (StringUtils.isBlank(phone)) { + return Optional.empty(); + } + return this.lambdaQuery() + .eq(SystemUser::getPhone, phone).ne(SystemUser::getStatus, 3).last("LIMIT 1").oneOpt(); + } + /** * 获取行政区划数据 + * * @param pcode * @return */ @Override - public List<Map<String, Object>> getRegion(String pcode) { + public List<RegionVO> getRegion(String pcode) { return this.baseMapper.getRegion(pcode); } /** * 获取街道数据 + * * @param areaCode * @return */ @Override - public List<Map<String, Object>> getStreet(String areaCode) { + public List<RegionVO> getStreet(String areaCode) { return this.baseMapper.getStreet(areaCode); } /** * 获取社区数据 + * * @param streetId * @return */ @Override - public List<Map<String, Object>> getCommunity(String streetId) { + public List<RegionVO> getCommunity(String streetId) { return this.baseMapper.getCommunity(streetId); } } -- Gitblit v1.7.1