From b6472f34695dccdc88055b66cc54169e8366cb10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 04 四月 2021 11:27:42 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 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 8a4c12a..86b36b6 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,29 +1,26 @@
package com.ruoyi.system.service.impl;
-import java.util.ArrayList;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import cn.hutool.core.lang.Validator;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.List;
/**
* 鐢ㄦ埛 涓氬姟灞傚鐞�
@@ -105,7 +102,7 @@
{
idsStr.append(role.getRoleName()).append(",");
}
- if (StringUtils.isNotEmpty(idsStr.toString()))
+ if (Validator.isNotEmpty(idsStr.toString()))
{
return idsStr.substring(0, idsStr.length() - 1);
}
@@ -127,7 +124,7 @@
{
idsStr.append(post.getPostName()).append(",");
}
- if (StringUtils.isNotEmpty(idsStr.toString()))
+ if (Validator.isNotEmpty(idsStr.toString()))
{
return idsStr.substring(0, idsStr.length() - 1);
}
@@ -160,9 +157,9 @@
@Override
public String checkPhoneUnique(SysUser user)
{
- Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+ Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
- if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+ if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@@ -178,9 +175,9 @@
@Override
public String checkEmailUnique(SysUser user)
{
- Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+ Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
- if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+ if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@@ -195,7 +192,7 @@
@Override
public void checkUserAllowed(SysUser user)
{
- if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
+ if (Validator.isNotNull(user.getUserId()) && user.isAdmin())
{
throw new CustomException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
}
@@ -312,7 +309,7 @@
public void insertUserRole(SysUser user)
{
Long[] roles = user.getRoleIds();
- if (StringUtils.isNotNull(roles))
+ if (Validator.isNotNull(roles))
{
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
List<SysUserRole> list = new ArrayList<SysUserRole>();
@@ -338,7 +335,7 @@
public void insertUserPost(SysUser user)
{
Long[] posts = user.getPostIds();
- if (StringUtils.isNotNull(posts))
+ if (Validator.isNotNull(posts))
{
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
List<SysUserPost> list = new ArrayList<SysUserPost>();
@@ -363,6 +360,7 @@
* @return 缁撴灉
*/
@Override
+ @Transactional
public int deleteUserById(Long userId)
{
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
@@ -379,12 +377,17 @@
* @return 缁撴灉
*/
@Override
+ @Transactional
public int deleteUserByIds(Long[] userIds)
{
for (Long userId : userIds)
{
checkUserAllowed(new SysUser(userId));
}
+ // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
+ userRoleMapper.deleteUserRole(userIds);
+ // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
+ userPostMapper.deleteUserPost(userIds);
return userMapper.deleteUserByIds(userIds);
}
@@ -399,7 +402,7 @@
@Override
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
{
- if (StringUtils.isNull(userList) || userList.size() == 0)
+ if (Validator.isNull(userList) || userList.size() == 0)
{
throw new CustomException("瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛�");
}
@@ -414,7 +417,7 @@
{
// 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
SysUser u = userMapper.selectUserByUserName(user.getUserName());
- if (StringUtils.isNull(u))
+ if (Validator.isNull(u))
{
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
--
Gitblit v1.9.3