From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/BranchOfficeServiceImpl.java | 52 ++--------------------------------------------------
1 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/BranchOfficeServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/BranchOfficeServiceImpl.java
index 742c1d9..340a10a 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/BranchOfficeServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/BranchOfficeServiceImpl.java
@@ -21,54 +21,6 @@
public class BranchOfficeServiceImpl extends ServiceImpl<BranchOfficeMapper, BranchOffice> implements IBranchOfficeService {
- /**
- * 获取开通省市数据
- * @return
- * @throws Exception
- */
- @Override
- public List<OpenCityWarpper> queryOpenCity() throws Exception {
- List<BranchOffice> branchOffices = this.selectList(new EntityWrapper<BranchOffice>().eq("status", 1));
- List<OpenCityWarpper> province = new ArrayList<>();
-
- //遍历处理省级数据
- List<String> provinceCodes = new ArrayList<>();
- for (BranchOffice branchOffice : branchOffices) {
- String provinceCode = branchOffice.getProvinceCode();
- if(!provinceCodes.contains(provinceCode)){
- provinceCodes.add(provinceCode);
-
- OpenCityWarpper openCityWarpper = new OpenCityWarpper();
- openCityWarpper.setCode(provinceCode);
- openCityWarpper.setName(branchOffice.getProvinceName());
- province.add(openCityWarpper);
- }
- }
-
- //遍历处理省级对应的市级数据
- for (OpenCityWarpper openCityWarpper : province) {
- String code = openCityWarpper.getCode();
-
- List<OpenCityWarpper> city = new ArrayList<>();
- List<String> cityCodes = new ArrayList<>();
- for (BranchOffice branchOffice : branchOffices) {
- String provinceCode1 = branchOffice.getProvinceCode();
- String cityCode = branchOffice.getCityCode();
-
- if(code.equals(provinceCode1) && !cityCodes.contains(cityCode)){
- cityCodes.add(cityCode);
-
- OpenCityWarpper openCityWarpper1 = new OpenCityWarpper();
- openCityWarpper1.setCode(cityCode);
- openCityWarpper1.setName(branchOffice.getCityName());
- city.add(openCityWarpper1);
- }
- }
- openCityWarpper.setSublevel(city);
- }
- return province;
- }
-
/**
* 根据城市code获取开通区域
@@ -82,8 +34,8 @@
List<OpenCityWarpper> district = new ArrayList<>();
for (BranchOffice branchOffice : branchOffices) {
OpenCityWarpper openCityWarpper = new OpenCityWarpper();
- openCityWarpper.setCode(branchOffice.getDistrictCode());
- openCityWarpper.setName(branchOffice.getDistrictName());
+ openCityWarpper.setCode(null != branchOffice.getDistrictCode() ? branchOffice.getDistrictCode() : branchOffice.getCityCode());
+ openCityWarpper.setName(null != branchOffice.getDistrictName() ? branchOffice.getDistrictName() : branchOffice.getCityName());
district.add(openCityWarpper);
}
return district;
--
Gitblit v1.7.1