From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
index 71f3aba..110a540 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
@@ -83,9 +83,12 @@
@Override
public R getCityTreeByProvinceCode(Integer provinceAdcode,String areaCode) {
+ //省份
List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(
new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
+ //市
List<ComMngCityDO> cityDOS = comMngCityDAO.selectList(new QueryWrapper<>());
+
List<ComMngDistrictDO> districtDOS = comMngDistrictDAO.selectList(new QueryWrapper<>());
List<ComMngAreaVO> vos = new ArrayList<>();
provinceDOS.forEach(p -> {
@@ -112,7 +115,7 @@
}
@Override
- public R getCityTreeByCode(Integer provinceAdcode, String areaCode) {
+ public R getCityTreeByCode(Integer provinceAdcode, String areaCode,String appId) {
//四川省
List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(
new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
@@ -141,24 +144,27 @@
ComStreetVO comStreetVO=new ComStreetVO();
comStreetVO.setAreaCode(d.getDistrictAdcode());
if (comStreetVO.getAreaCode() != null) {
- param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
+ param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode())
+ .eq(ComStreetDO::getAppId, appId);
}
List<ComStreetDO> comStreetDOS = comStreetDAO.selectList(param);
comStreetDOS.forEach(dos ->
{
- ComMngAreaVO csd = new ComMngAreaVO(0, dos.getName(),dos.getStreetId()+"");
+ ComMngAreaVO csd = new ComMngAreaVO(0, dos.getName());
BeanUtils.copyProperties(dos, csd);
districtVo.getChildren().add(csd);
// 查询街道下社区列表
List<CommunitySwitchAllAppletsVO> communityList = comActDAO.getCommunityListByStreetId(dos.getStreetId());
- communityList.forEach(csaa ->{
- ComMngAreaVO cssd = new ComMngAreaVO(0, csaa.getName(),csaa.getCommunityId()+"");
- BeanUtils.copyProperties(csaa, cssd);
+ communityList.forEach(commItem ->
+ {
+ ComMngAreaVO cssd = new ComMngAreaVO(0, commItem.getName(),commItem.getCommunityId()+"");
+ BeanUtils.copyProperties(commItem, cssd);
csd.getChildren().add(cssd);
-
});
+
+
});
--
Gitblit v1.7.1