From c0685b7f7ff16ece7a7fbd9dd79423513764c382 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 28 十月 2022 19:48:22 +0800
Subject: [PATCH] !608 编辑头像时生成为透明png图片 Merge pull request !608 from BlossomWave/N/A
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index bf4ca17..29e3795 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -161,14 +161,15 @@
/**
* 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
*
- * @param userName 鐢ㄦ埛鍚嶇О
+ * @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public String checkUserNameUnique(String userName)
+ public String checkUserNameUnique(SysUser user)
{
- int count = userMapper.checkUserNameUnique(userName);
- if (count > 0)
+ Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+ SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@@ -381,7 +382,7 @@
*/
public void insertUserRole(SysUser user)
{
- this.insertUserRole(user.getUserId, user.getRoleIds());
+ this.insertUserRole(user.getUserId(), user.getRoleIds());
}
/**
@@ -507,6 +508,8 @@
else if (isUpdateSupport)
{
BeanValidators.validateWithException(validator, user);
+ checkUserAllowed(user);
+ checkUserDataScope(user.getUserId());
user.setUpdateBy(operName);
this.updateUser(user);
successNum++;
--
Gitblit v1.9.3