From de17f911865ad0c3a52754140828db92c9e62e46 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 15:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index c4d657b..1004a2d 100644
--- a/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -140,6 +140,13 @@
{
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
+ if (user.getIsDriver() == 0 && !userService.checkDriverUnique(user)){
+ return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄┚椹跺憳宸茬粦瀹氬叾浠栬处鎴�");
+
+ }else{
+ user.setDriverId(null);
+ }
+
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user));
@@ -169,6 +176,11 @@
{
return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
+ if (user.getIsDriver() == 0 && !userService.checkDriverUnique(user)){
+ return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄┚椹跺憳宸茬粦瀹氬叾浠栬处鎴�");
+
+ }
+
user.setUpdateBy(getUsername());
return toAjax(userService.updateUser(user));
}
--
Gitblit v1.8.0