From 9d1ab00d884b2225b60ee3efe3c00db510f91a29 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 二月 2025 17:57:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 ddfbdfa..7faf0ca 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
@@ -11,6 +11,9 @@
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;
/**
@@ -26,11 +29,11 @@
* @return
*/
@Override
- public IPage<SystemUserListVo> list(Integer accountLevel, SystemUserList query) {
+ public IPage<SystemUserListVo> list(SystemUser user, SystemUserList query) {
Page page = new Page<>();
page.setCurrent(query.getPageNum());
page.setSize(query.getPageSize());
- IPage<SystemUserListVo> list = this.baseMapper.list(page, accountLevel, query);
+ IPage<SystemUserListVo> list = this.baseMapper.list(page, user, query);
return list;
}
@@ -48,4 +51,39 @@
.eq(SystemUser::getPhone, phone).ne(SystemUser::getStatus, 3)
.eq(SystemUser::getIsAdmin, 1).last("LIMIT 1").oneOpt();
}
+
+
+
+
+ /**
+ * 获取行政区划数据
+ * @param pcode
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> getRegion(String pcode) {
+ return this.baseMapper.getRegion(pcode);
+ }
+
+
+ /**
+ * 获取街道数据
+ * @param areaCode
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> getStreet(String areaCode) {
+ return this.baseMapper.getStreet(areaCode);
+ }
+
+
+ /**
+ * 获取社区数据
+ * @param streetId
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> getCommunity(String streetId) {
+ return this.baseMapper.getCommunity(streetId);
+ }
}
--
Gitblit v1.7.1