From 15f0ac8c4c407075ad7a2e07eb8823d72234c62c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 五月 2023 15:18:56 +0800
Subject: [PATCH] 分公司，司机修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index d6eac87..c334ef6 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -335,12 +335,24 @@
tDriver.setCityName(city.getName());
tDriver.setCityCode(city.getCode());
- TRegion area = tRegionMapper.selectById(split[2]);
- if(Objects.isNull(area)){
- area = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[2]));
+// TRegion area = tRegionMapper.selectById(split[2]);
+// if(Objects.isNull(area)){
+// area = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[2]));
+// }
+// tDriver.setAreaName(area.getName());
+// tDriver.setAreaCode(area.getCode());
+ TRegion area = null;
+ if(split.length>2){
+ area = itRegionService.selectById(split[2]);
+ if(Objects.isNull(area)){
+ area = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[2]));
+ }
+ tDriver.setAreaName(area.getName());
+ tDriver.setAreaCode(area.getCode());
+ }else {
+ tDriver.setAreaName(city.getName());
+ tDriver.setAreaCode(city.getCode());
}
- tDriver.setAreaName(area.getName());
- tDriver.setAreaCode(area.getCode());
// 通过省市查询代理商
List<TAgent> tAgent = tAgentMapper.selectList(new EntityWrapper<TAgent>().eq("provinceCode", province.getCode())
@@ -363,12 +375,22 @@
return new SuccessTip(500, "该邀约人:"+tDriver.getInviterName()+"不存在");
}
}
- // 通过省市区查询分公司
- List<TBranchOffice> tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
- .eq("cityCode", city.getCode())
- .eq("status", StatusEnum.NORMAL.getCode())
- .eq("districtCode", area.getCode())
- .last("LIMIT 1"));
+ List<TBranchOffice> tBranchOffice;
+ if(split.length>2){
+ // 通过省市区查询分公司
+ tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
+ .eq("cityCode", city.getCode())
+ .eq("status", StatusEnum.NORMAL.getCode())
+ .eq("districtCode", area.getCode())
+ .last("LIMIT 1"));
+ }else {
+ // 通过省市区查询分公司
+ tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
+ .eq("cityCode", city.getCode())
+ .eq("status", StatusEnum.NORMAL.getCode())
+ .eq("districtCode", city.getCode())
+ .last("LIMIT 1"));
+ }
if(!CollectionUtils.isEmpty(tBranchOffice)){
tDriver.setBranchOfficeId(tBranchOffice.get(0).getId());
}else {
--
Gitblit v1.7.1