From b892b3d8c2a536b6c2f5f9b9e67e195779037665 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 15 十一月 2022 14:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 e92397a..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()
@@ -66,7 +68,7 @@
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()!=4)
+ if (areaCode2022.getLevel()!=3)
areaCode2022.setChild(this.getListByPCode(areaCode2022.getCode().toString()));
}
return areaCode2022s;
--
Gitblit v1.7.1