From d2c5f419fa584cd1061b13d47f4963d7a2ef3e3a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 29 八月 2025 10:45:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ZhaoYangChuXing into dev
---
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index fa2540d..db1021e 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -838,7 +838,8 @@
TDriver obj = tDriverService.selectById(tDriver.getId());
if (!obj.getPhone().equals(tDriver.getPhone())){
//判断登录账户是否重复
- int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3"));
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone())
+ .in("authState", "1,2,3").ne("flag", 3));
if (count > 0){
return "error";
}
--
Gitblit v1.7.1