bug修复

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -78,6 +78,13 @@ public interface SysDeptMapper
      */
     public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
 
+    /**
+     * 根据部门名称查询部门信息
+     * @param deptName
+     * @return
+     */
+    public SysDept selectDeptByName(@Param("deptName") String deptName);
+
     /**
      * 新增部门信息
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -2,11 +2,13 @@ package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.entity.SysUserDept;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -66,6 +68,8 @@ public class SysUserServiceImpl implements ISysUserService {
 
     @Autowired
     protected Validator validator;
+    @Autowired
+    private RedisCache redisCache;
 
     /**
      * 根据条件分页查询用户列表
@@ -245,6 +249,8 @@ public class SysUserServiceImpl implements ISysUserService {
         user.setCreateBy("admin");
         user.setCreateTime(DateUtils.getNowDate());
         int rows = userMapper.insertUser(user);
+        // redis缓存
+        redisCache.setCacheObject(CacheConstants.USER_KEY+user.getUserId(),user);
         // 新增用户部门关联
         if(CollectionUtil.isNotEmpty(user.getDeptIds())) {
             // 先删除用户与部门关联
@@ -273,7 +279,10 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public boolean registerUser(SysUser user) {
-        return userMapper.insertUser(user) > 0;
+        int i = userMapper.insertUser(user);
+        // redis缓存
+        redisCache.setCacheObject(CacheConstants.USER_KEY+user.getUserId(),user);
+        return i > 0;
     }
 
     /**
@@ -308,6 +317,8 @@ public class SysUserServiceImpl implements ISysUserService {
         // 新增用户与岗位管理
         insertUserPost(user);
         userMapper.updateUser(user);
+        // redis缓存
+        redisCache.setCacheObject(CacheConstants.USER_KEY+user.getUserId(),user);
         return AjaxResult.success("更新用户成功");
     }
 
@@ -332,7 +343,10 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public int updateUserStatus(SysUser user) {
-        return userMapper.updateUser(user);
+        int i = userMapper.updateUser(user);
+        // redis缓存
+        redisCache.setCacheObject(CacheConstants.USER_KEY+user.getUserId(),user);
+        return i;
     }
 
     /**
@@ -343,7 +357,10 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public int updateUserProfile(SysUser user) {
-        return userMapper.updateUser(user);
+        int i = userMapper.updateUser(user);
+        // redis缓存
+        redisCache.setCacheObject(CacheConstants.USER_KEY+user.getUserId(),user);
+        return i;
     }
 
     /**
@@ -366,7 +383,10 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public int resetPwd(SysUser user) {
-        return userMapper.updateUser(user);
+        int i = userMapper.updateUser(user);
+        // redis缓存
+        redisCache.setCacheObject(CacheConstants.USER_KEY+user.getUserId(),user);
+        return i;
     }
 
     /**
@@ -443,7 +463,10 @@ public class SysUserServiceImpl implements ISysUserService {
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 删除用户与岗位表
         userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
+        int i = userMapper.deleteUserById(userId);
+        // 删除缓存
+        redisCache.deleteObject(CacheConstants.USER_KEY+userId);
+        return i;
     }
 
     /**
@@ -465,7 +488,12 @@ public class SysUserServiceImpl implements ISysUserService {
         userPostMapper.deleteUserPost(userIds);
         // 删除用户部门关联
         userDeptMapper.deleteUserByIds(userIds);
-        return userMapper.deleteUserByIds(userIds);
+        int i = userMapper.deleteUserByIds(userIds);
+            for (Long userId : userIds) {
+                // 删除缓存
+                redisCache.deleteObject(CacheConstants.USER_KEY+userId);
+            }
+        return i;
     }
 
     /**
@@ -495,6 +523,8 @@ public class SysUserServiceImpl implements ISysUserService {
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
                     userMapper.insertUser(user);
+                    // redis缓存
+                    redisCache.setCacheObject(CacheConstants.USER_KEY+user.getUserId(),user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                 } else if (isUpdateSupport) {
@@ -504,6 +534,8 @@ public class SysUserServiceImpl implements ISysUserService {
                     user.setUserId(u.getUserId());
                     user.setUpdateBy(operName);
                     userMapper.updateUser(user);
+                    // redis缓存
+                    redisCache.setCacheObject(CacheConstants.USER_KEY+user.getUserId(),user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
                 } else {