From 1ffff09037abaddd6e5edb2ae4813a51444200fa Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 五月 2023 15:37:53 +0800
Subject: [PATCH] 分公司回显，司机回显
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java | 4 ++--
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 19 ++++++++++++++++---
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
index 4438cf1..02931bd 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
@@ -96,14 +96,14 @@
TRegion district = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tBranchOffice.getDistrictCode())
.last("LIMIT 1"));
- if(StringUtils.hasLength(tBranchOffice.getDistrictName())){
+ if(StringUtils.hasLength(tBranchOffice.getDistrictName()) && !tBranchOffice.getDistrictName().equals(tBranchOffice.getCityName())){
tBranchOfficeResp.setArea(tBranchOffice.getProvinceName()+"/"+tBranchOffice.getCityName()+"/"+tBranchOffice.getDistrictName());
}else {
tBranchOfficeResp.setArea(tBranchOffice.getProvinceName()+"/"+tBranchOffice.getCityName());
}
if(Objects.nonNull(city)){
- if(Objects.nonNull(district)){
+ if(Objects.nonNull(district) && !district.getCode().equals(city.getCode())){
tBranchOfficeResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
}else {
tBranchOfficeResp.setAreaId(city.getParentId()+"/"+city.getId());
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 9f1e6bd..3c272bb 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -141,9 +141,22 @@
TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tDriver.getCityCode())
.last("LIMIT 1"));
- tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
- if(Objects.nonNull(district) && Objects.nonNull(city)){
- tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
+// tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
+// if(Objects.nonNull(district) && Objects.nonNull(city)){
+// tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
+// }
+ if(StringUtils.hasLength(tDriver.getAreaName()) && !tDriver.getAreaName().equals(tDriver.getCityName())){
+ tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
+ }else {
+ tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName());
+ }
+
+ if(Objects.nonNull(city)){
+ if(Objects.nonNull(district) && !district.getCode().equals(city.getCode())){
+ tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
+ }else {
+ tDriverResp.setAreaId(city.getParentId()+"/"+city.getId());
+ }
}
model.addAttribute("item",tDriverResp);
--
Gitblit v1.7.1