From 92ed53e44fb2da1f91b8fb9932af8ff433febe83 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 06 七月 2022 18:47:09 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/AreaInnerServiceSMOImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/AreaInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/AreaInnerServiceSMOImpl.java
index 83e6ad8..93b41fd 100755
--- a/service-common/src/main/java/com/java110/common/smo/impl/AreaInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/AreaInnerServiceSMOImpl.java
@@ -42,9 +42,9 @@
if (areaDto.getAreaCode() != null && areaDto.getAreaCode().length() > 5){
areacode = areaDto.getAreaCode();
}else{
- areacode = "110101";
+ areacode = "110101001";//涓滃崕闂ㄨ閬�
}
- areaDto.setAreaCode(areacode);
+ areaDto.setAreaCode(areacode.substring(0,2));
List<AreaDto> areas = BeanConvertUtil.covertBeanList(areaServiceDaoImpl.getWholeArea(BeanConvertUtil.beanCovertMap(areaDto)), AreaDto.class);
List<AreaDto> newlist = new ArrayList();
AreaDto nowarea = new AreaDto();
@@ -60,7 +60,7 @@
return newlist;
}
- private static void getTree(List<AreaDto> areas,AreaDto area,List<AreaDto> newlist){
+ private void getTree(List<AreaDto> areas,AreaDto area,List<AreaDto> newlist){
for (AreaDto a :areas){
if (area.getParentAreaCode().equals(a.getAreaCode())){
newlist.add(a);
@@ -71,8 +71,6 @@
}
}
}
-
-
}
--
Gitblit v1.8.0