From cc2624d08e422c36a4f93cc15d0ca0f0b7b4951a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 17 一月 2022 15:46:28 +0800
Subject: [PATCH] update 优化加载字典缓存数据
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 9dd77a0..dfa606c 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
@@ -11,8 +11,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.LoginUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysPost;
@@ -164,8 +163,8 @@
public String checkPhoneUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
boolean count = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
- .eq(SysUser::getPhonenumber, user.getPhonenumber())
- .ne(SysUser::getUserId, userId));
+ .eq(SysUser::getPhonenumber, user.getPhonenumber())
+ .ne(SysUser::getUserId, userId));
if (count) {
return UserConstants.NOT_UNIQUE;
}
@@ -182,8 +181,8 @@
public String checkEmailUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
boolean count = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
- .eq(SysUser::getEmail, user.getEmail())
- .ne(SysUser::getUserId, userId));
+ .eq(SysUser::getEmail, user.getEmail())
+ .ne(SysUser::getUserId, userId));
if (count) {
return UserConstants.NOT_UNIQUE;
}
@@ -209,7 +208,7 @@
*/
@Override
public void checkUserDataScope(Long userId) {
- if (!SysUser.isAdmin(LoginUtils.getUserId())) {
+ if (!SysUser.isAdmin(LoginHelper.getUserId())) {
SysUser user = new SysUser();
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
@@ -279,7 +278,7 @@
@Transactional(rollbackFor = Exception.class)
public void insertUserAuth(Long userId, Long[] roleIds) {
userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
- .eq(SysUserRole::getUserId, userId));
+ .eq(SysUserRole::getUserId, userId));
insertUserRole(userId, roleIds);
}
@@ -315,9 +314,9 @@
@Override
public boolean updateUserAvatar(String userName, String avatar) {
return baseMapper.update(null,
- new LambdaUpdateWrapper<SysUser>()
- .set(SysUser::getAvatar, avatar)
- .eq(SysUser::getUserName, userName)) > 0;
+ new LambdaUpdateWrapper<SysUser>()
+ .set(SysUser::getAvatar, avatar)
+ .eq(SysUser::getUserName, userName)) > 0;
}
/**
@@ -341,9 +340,9 @@
@Override
public int resetUserPwd(String userName, String password) {
return baseMapper.update(null,
- new LambdaUpdateWrapper<SysUser>()
- .set(SysUser::getPassword, password)
- .eq(SysUser::getUserName, userName));
+ new LambdaUpdateWrapper<SysUser>()
+ .set(SysUser::getPassword, password)
+ .eq(SysUser::getUserName, userName));
}
/**
--
Gitblit v1.9.3