From 5f0e4e81f09720335d9216b6de57a3746fc92025 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 20 一月 2022 17:13:54 +0800
Subject: [PATCH] !131 fix 修改用户信息校验方法 Merge pull request !131 from KonBAI/fix_cheakUserInfo
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 109 ++++++++++++++++++++++--------------------------------
1 files changed, 45 insertions(+), 64 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 ef32fd1..1dbbf7a 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
@@ -1,19 +1,18 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
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.PageUtils;
-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;
@@ -21,14 +20,15 @@
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysUserService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛 涓氬姟灞傚鐞�
@@ -36,26 +36,20 @@
* @author Lion Li
*/
@Slf4j
+@RequiredArgsConstructor
@Service
-public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser, SysUser> implements ISysUserService, UserService {
+public class SysUserServiceImpl implements ISysUserService, UserService {
- @Autowired
- private SysRoleMapper roleMapper;
-
- @Autowired
- private SysPostMapper postMapper;
-
- @Autowired
- private SysUserRoleMapper userRoleMapper;
-
- @Autowired
- private SysUserPostMapper userPostMapper;
+ private final SysUserMapper baseMapper;
+ private final SysRoleMapper roleMapper;
+ private final SysPostMapper postMapper;
+ private final SysUserRoleMapper userRoleMapper;
+ private final SysUserPostMapper userPostMapper;
@Override
- @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
- Page<SysUser> page = baseMapper.selectPageUserList(PageUtils.buildPage(pageQuery), user);
- return PageUtils.buildDataInfo(page);
+ Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), user);
+ return TableDataInfo.build(page);
}
/**
@@ -65,7 +59,6 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
public List<SysUser> selectUserList(SysUser user) {
return baseMapper.selectUserList(user);
}
@@ -77,10 +70,9 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
public TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery) {
- Page<SysUser> page = baseMapper.selectAllocatedList(PageUtils.buildPage(pageQuery), user);
- return PageUtils.buildDataInfo(page);
+ Page<SysUser> page = baseMapper.selectAllocatedList(pageQuery.build(), user);
+ return TableDataInfo.build(page);
}
/**
@@ -90,10 +82,9 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
- Page<SysUser> page = baseMapper.selectUnallocatedList(PageUtils.buildPage(pageQuery), user);
- return PageUtils.buildDataInfo(page);
+ Page<SysUser> page = baseMapper.selectUnallocatedList(pageQuery.build(), user);
+ return TableDataInfo.build(page);
}
/**
@@ -127,14 +118,10 @@
@Override
public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
- StringBuilder idsStr = new StringBuilder();
- for (SysRole role : list) {
- idsStr.append(role.getRoleName()).append(",");
+ if (CollUtil.isEmpty(list)) {
+ return StringUtils.EMPTY;
}
- if (StringUtils.isNotEmpty(idsStr.toString())) {
- return idsStr.substring(0, idsStr.length() - 1);
- }
- return idsStr.toString();
+ return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
}
/**
@@ -146,14 +133,10 @@
@Override
public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
- StringBuilder idsStr = new StringBuilder();
- for (SysPost post : list) {
- idsStr.append(post.getPostName()).append(",");
+ if (CollUtil.isEmpty(list)) {
+ return StringUtils.EMPTY;
}
- if (StringUtils.isNotEmpty(idsStr.toString())) {
- return idsStr.substring(0, idsStr.length() - 1);
- }
- return idsStr.toString();
+ return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
}
/**
@@ -164,8 +147,8 @@
*/
@Override
public String checkUserNameUnique(String userName) {
- long count = count(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName));
- if (count > 0) {
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -179,11 +162,10 @@
*/
@Override
public String checkPhoneUnique(SysUser user) {
- Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
- long count = count(new LambdaQueryWrapper<SysUser>()
- .eq(SysUser::getPhonenumber, user.getPhonenumber())
- .ne(SysUser::getUserId, userId));
- if (count > 0) {
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getPhonenumber, user.getPhonenumber())
+ .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -197,11 +179,10 @@
*/
@Override
public String checkEmailUnique(SysUser user) {
- Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
- long count = count(new LambdaQueryWrapper<SysUser>()
- .eq(SysUser::getEmail, user.getEmail())
- .ne(SysUser::getUserId, userId));
- if (count > 0) {
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getEmail, user.getEmail())
+ .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -226,7 +207,7 @@
*/
@Override
public void checkUserDataScope(Long userId) {
- if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+ if (!SysUser.isAdmin(LoginHelper.getUserId())) {
SysUser user = new SysUser();
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
@@ -296,7 +277,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);
}
@@ -332,9 +313,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;
}
/**
@@ -358,9 +339,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));
}
/**
@@ -380,7 +361,7 @@
list.add(ur);
}
if (list.size() > 0) {
- userRoleMapper.insertAll(list);
+ userRoleMapper.insertBatch(list);
}
}
}
@@ -402,7 +383,7 @@
list.add(up);
}
if (list.size() > 0) {
- userPostMapper.insertAll(list);
+ userPostMapper.insertBatch(list);
}
}
}
@@ -424,7 +405,7 @@
list.add(ur);
}
if (list.size() > 0) {
- userRoleMapper.insertAll(list);
+ userRoleMapper.insertBatch(list);
}
}
}
--
Gitblit v1.9.3