From 1892f1e72f81ef87a8fa78ce0c13354f0a6bb6ea Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 22 一月 2026 21:41:13 +0800
Subject: [PATCH] fix(management):0122测试bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 0aa7132..c50de03 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -2037,12 +2037,12 @@
if (count > 0){
continue;
}
-
- Boolean b = UserUtil.idCardAuth(zero, five);
- if(!b){
- drivers.add(zero);
- continue;
- }
+ //
+ // Boolean b = UserUtil.idCardAuth(zero, five);
+ // if(!b){
+ // drivers.add(zero);
+ // continue;
+ // }
//判断性别
if (!two.equals("男") && !two.equals("女")){
return new ErrorTip(500, "性别内容不正确");
@@ -2096,7 +2096,7 @@
}
// 校验从业地是否在公司经营区域内
- String placeError = validatePlaceOfEmployment(companyId, cell1701);
+ String placeError = validatePlaceOfEmployment(companyId, cell1701, 2);
if (placeError != null) {
return new ErrorTip(500, placeError);
}
@@ -2422,7 +2422,7 @@
}
// 校验从业地是否在公司经营区域内
- String placeError = validatePlaceOfEmployment(companyId, cell1701);
+ String placeError = validatePlaceOfEmployment(companyId, cell1701, 3);
if (placeError != null) {
return new ErrorTip(500, placeError);
}
@@ -2568,10 +2568,19 @@
* @param placeOfEmployment 从业地行政编号
* @return 错误信息，null表示校验通过
*/
- private String validatePlaceOfEmployment(Integer companyId, String placeOfEmployment) {
+ private String validatePlaceOfEmployment(Integer companyId, String placeOfEmployment, Integer roleType) {
if (companyId == null || SinataUtil.isEmpty(placeOfEmployment)) {
return null;
}
+ if (roleType.equals(3)) {
+ //查询该加盟商所属的分公司
+ TCompany tCompany = tCompanyService.selectById(companyId);
+ if (Objects.nonNull(tCompany) && Objects.nonNull(tCompany.getSuperiorId())) {
+ companyId = tCompany.getSuperiorId();
+ } else {
+ return null;
+ }
+ }
List<TCompanyCity> companyCityList = tCompanyCityService.selectList(
new EntityWrapper<TCompanyCity>().eq("companyId", companyId).eq("state", 1));
if (companyCityList == null || companyCityList.isEmpty()) {
--
Gitblit v1.7.1