From 93c64d57fa870193d4971509d0a20c3be8779565 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 22 八月 2024 16:44:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 5636e6a..1c3736d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -239,7 +239,6 @@
if (user.getPhonenumber() != null) {
user.setUserName(user.getPhonenumber());
}
- user.setPassword(null);
user.setUpdateBy(SecurityUtils.getUsername());
user.setUpdateTime(new Date());
userService.updateUser(user);
@@ -371,11 +370,13 @@
sysUser.setUpdateBy(SecurityUtils.getUsername());
sysUser.setUpdateTime(new Date());
userService.updateUser(sysUser);
- userRoleService.deleteSysUserRoleByUserId(sysUser.getUserId());
- SysUserRole sysUserRole = new SysUserRole();
- sysUserRole.setRoleId(sysUser.getRoleId());
- sysUserRole.setUserId(sysUser.getUserId());
- userRoleService.insertSysUserRole(sysUserRole);
+ if(null != sysUser.getRoleId()){
+ userRoleService.deleteSysUserRoleByUserId(sysUser.getUserId());
+ SysUserRole sysUserRole = new SysUserRole();
+ sysUserRole.setRoleId(sysUser.getRoleId());
+ sysUserRole.setUserId(sysUser.getUserId());
+ userRoleService.insertSysUserRole(sysUserRole);
+ }
return R.ok(true);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.7.1