From 654dd616eb6d808b1484d56c207f5610ab335a8e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 10:29:19 +0800
Subject: [PATCH] 修改bug
---
ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 5c12df7..0026117 100644
--- a/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -621,7 +621,7 @@
@ResponseBody
public Object add(TDriver tDriver,@RequestParam String serverBox,@RequestParam String lineStr,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId) {
//判断登录账户是否重复
- int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3").ne("flag", 3));
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", Arrays.asList(1, 2, 3)).ne("flag", 3));
if (count > 0){
return "error";
}
@@ -769,7 +769,7 @@
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", Arrays.asList(1, 2, 3)).ne("flag", 3));
if (count > 0){
return "error";
}
@@ -808,6 +808,8 @@
// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
if(ToolUtil.isNotEmpty(tDriver.getPassword())){
tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
+ }else{
+ tDriver.setPassword(null);
}
tDriverService.updateById(tDriver);
--
Gitblit v1.7.1