From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
index 01d7434..7fd2db9 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
@Service
@@ -26,6 +27,7 @@
@Override
public List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId){
+// HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
eq(TransactionEvent::getId, transactionId));
OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
@@ -40,23 +42,37 @@
areaCodes.add(organizationChartEntity.getVillage());
getAreaCodeIds(areaCodes,organizationChartEntity);
}
- return baseMapper.selectByIdSet(areaCodes);
+ if (areaCodes.size()==0)
+ return null;
+ else
+ return baseMapper.selectByIdSet(areaCodes);
}
+
public List<String> getAreaCodeIds(List<String> areaCodes, OrganizationChartEntity organizationChartEntity){
- organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
+ List<OrganizationChartEntity> organizationChartEntitys= organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
.eq(OrganizationChartEntity::getParentId, organizationChartEntity.getId()));
- if (organizationChartEntity!=null){
- if (organizationChartEntity.getCity()!=null)
- areaCodes.add(organizationChartEntity.getCity());
- if (organizationChartEntity.getDistrict()!=null)
- areaCodes.add(organizationChartEntity.getDistrict());
- if (organizationChartEntity.getVillage()!=null)
- areaCodes.add(organizationChartEntity.getVillage());
- getAreaCodeIds(areaCodes,organizationChartEntity);
+ for (OrganizationChartEntity organizationChart:organizationChartEntitys) {
+ if (organizationChart.getCity()!=null)
+ areaCodes.add(organizationChart.getCity());
+ if (organizationChart.getDistrict()!=null)
+ areaCodes.add(organizationChart.getDistrict());
+ if (organizationChart.getVillage()!=null)
+ areaCodes.add(organizationChart.getVillage());
+ getAreaCodeIds(areaCodes,organizationChart);
}
return areaCodes;
}
+ @Override
+ public List<AreaCode2022> getListByPCode(String id){
+ List<AreaCode2022> areaCode2022s = baseMapper.selectList(new QueryWrapper<AreaCode2022>().lambda().eq(AreaCode2022::getPcode, id));
+ for (AreaCode2022 areaCode2022:areaCode2022s) {
+ if (areaCode2022.getLevel()!=3)
+ areaCode2022.setChild(this.getListByPCode(areaCode2022.getCode().toString()));
+ }
+ return areaCode2022s;
+ }
+
}
--
Gitblit v1.7.1