修改用户状态-强制下线

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.core.enums.UserType;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
@@ -95,7 +96,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         customer.setUserLevel((byte) (loginUser.getUserLevel() + 1));
         customer.setPid(loginUser.getUserId());
         customer.setStatus("0");
-
+        customer.setUserType(UserType.SYS_USER.getUserType());
         save(customer);
 
         // 新增用户与角色管理
@@ -117,6 +118,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     @Transactional(rollbackFor = Exception.class)
     public void updateCustomer(Customer customer) throws Exception {
 
+        // 获取当前会话账号id, 如果未登录，则抛出异常：`NotLoginException`
+        Object loginId = StpUtil.getLoginId();
+
         UserQueryCriteria userQueryCriteria = new UserQueryCriteria();
         if (StringUtils.isNotEmpty(customer.getUserName())) {
             userQueryCriteria.setCustomerName(customer.getUserName());
@@ -130,17 +134,19 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
             customer.setStatus("0");
         } else {
             // 强制下线
-            // StpUtil.logout(customer.getCustomerId());
+            // String tokenId = customer.getUserType() + ":" + customer.getCustomerId();
+            String tokenId = UserType.SYS_USER.getUserType() + ":" + customer.getCustomerId();
+            StpUtil.logout(tokenId);
             // StpUtil.kickout(customer.getCustomerId());
             customer.setStatus("1");
             // 检查目标用户是否有有效的登录状态
-            if (StpUtil.isLogin(customer.getCustomerId())) {
+            // if (StpUtil.isLogin(customer.getCustomerId())) {
-                // 用户已登录，可以执行踢出操作
+            //     // 用户已登录，可以执行踢出操作
-                StpUtil.kickout(customer.getCustomerId());
+            //     StpUtil.kickout(customer.getCustomerId());
-            } else {
+            // } else {
-                // 用户未登录，无法踢出
+            //     // 用户未登录，无法踢出
-                System.out.println("目标用户未登录，无法执行踢出操作");
+            //     System.out.println("目标用户未登录，无法执行踢出操作");
-            }
+            // }
         }
         saveOrUpdate(customer);
     }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java

@@ -6,17 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fuyuanshen.common.core.domain.PageResult;
 import com.fuyuanshen.common.core.domain.model.LoginUser;
-import com.fuyuanshen.common.core.utils.PageUtil;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.DeviceAssignments;
 import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.DeviceTypeGrants;
 import com.fuyuanshen.equipment.domain.form.DeviceTypeForm;
-import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
 import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;

fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.system.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
@@ -11,6 +12,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.common.core.enums.UserStatus;
+import com.fuyuanshen.common.core.enums.UserType;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import com.fuyuanshen.common.core.constant.CacheNames;
@@ -76,20 +79,20 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         Map<String, Object> params = user.getParams();
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", SystemConstants.NORMAL)
-            .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
+                .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
-            .in(StringUtils.isNotBlank(user.getUserIds()), "u.user_id", StringUtils.splitTo(user.getUserIds(), Convert::toLong))
+                .in(StringUtils.isNotBlank(user.getUserIds()), "u.user_id", StringUtils.splitTo(user.getUserIds(), Convert::toLong))
-            .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
-            .like(StringUtils.isNotBlank(user.getNickName()), "u.nick_name", user.getNickName())
+                .like(StringUtils.isNotBlank(user.getNickName()), "u.nick_name", user.getNickName())
-            .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
+                .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
+                .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
-            .between(params.get("beginTime") != null && params.get("endTime") != null,
+                .between(params.get("beginTime") != null && params.get("endTime") != null,
-                "u.create_time", params.get("beginTime"), params.get("endTime"))
+                        "u.create_time", params.get("beginTime"), params.get("endTime"))
-            .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
+                .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
-                List<SysDept> deptList = deptMapper.selectListByParentId(user.getDeptId());
+                    List<SysDept> deptList = deptMapper.selectListByParentId(user.getDeptId());
-                List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
+                    List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
-                ids.add(user.getDeptId());
+                    ids.add(user.getDeptId());
-                w.in("u.dept_id", ids);
+                    w.in("u.dept_id", ids);
-            }).orderByAsc("u.user_id");
+                }).orderByAsc("u.user_id");
         if (StringUtils.isNotBlank(user.getExcludeUserIds())) {
             wrapper.notIn("u.user_id", StringUtils.splitTo(user.getExcludeUserIds(), Convert::toLong));
         }
@@ -106,11 +109,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     public TableDataInfo<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery) {
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", SystemConstants.NORMAL)
-            .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
+                .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
-            .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
-            .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
+                .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
+                .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
-            .orderByAsc("u.user_id");
+                .orderByAsc("u.user_id");
         Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
         return TableDataInfo.build(page);
     }
@@ -126,11 +129,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", SystemConstants.NORMAL)
-            .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
+                .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
-            .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
+                .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
-            .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
+                .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
-            .orderByAsc("u.user_id");
+                .orderByAsc("u.user_id");
         Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
         return TableDataInfo.build(page);
     }
@@ -183,10 +186,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public List<SysUserVo> selectUserByIds(List<Long> userIds, Long deptId) {
         return baseMapper.selectUserList(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName)
+                .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName)
-            .eq(SysUser::getStatus, SystemConstants.NORMAL)
+                .eq(SysUser::getStatus, SystemConstants.NORMAL)
-            .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId)
+                .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId)
-            .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds));
+                .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds));
     }
 
     /**
@@ -228,8 +231,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public boolean checkUserNameUnique(SysUserBo user) {
         boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
-            .eq(SysUser::getUserName, user.getUserName())
+                .eq(SysUser::getUserName, user.getUserName())
-            .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+                .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
         return !exist;
     }
 
@@ -241,8 +244,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public boolean checkPhoneUnique(SysUserBo user) {
         boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
-            .eq(SysUser::getPhonenumber, user.getPhonenumber())
+                .eq(SysUser::getPhonenumber, user.getPhonenumber())
-            .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+                .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
         return !exist;
     }
 
@@ -254,8 +257,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public boolean checkEmailUnique(SysUserBo user) {
         boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
-            .eq(SysUser::getEmail, user.getEmail())
+                .eq(SysUser::getEmail, user.getEmail())
-            .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+                .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
         return !exist;
     }
 
@@ -359,6 +362,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         insertUserRole(userId, roleIds, true);
     }
 
+
     /**
      * 修改用户状态
      *
@@ -368,12 +372,19 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public int updateUserStatus(Long userId, String status) {
+        if (UserStatus.DISABLE.getCode().equals(status)) {
+            // 强制下线
+            String tokenId = UserType.SYS_USER.getUserType() + ":" + userId;
+            StpUtil.logout(tokenId);
+        }
+
         return baseMapper.update(null,
-            new LambdaUpdateWrapper<SysUser>()
+                new LambdaUpdateWrapper<SysUser>()
-                .set(SysUser::getStatus, status)
+                        .set(SysUser::getStatus, status)
-                .eq(SysUser::getUserId, userId));
+                        .eq(SysUser::getUserId, userId));
     }
 
+
     /**
      * 修改用户基本信息
      *
@@ -384,12 +395,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public int updateUserProfile(SysUserBo user) {
         return baseMapper.update(null,
-            new LambdaUpdateWrapper<SysUser>()
+                new LambdaUpdateWrapper<SysUser>()
-                .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName())
+                        .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName())
-                .set(SysUser::getPhonenumber, user.getPhonenumber())
+                        .set(SysUser::getPhonenumber, user.getPhonenumber())
-                .set(SysUser::getEmail, user.getEmail())
+                        .set(SysUser::getEmail, user.getEmail())
-                .set(SysUser::getSex, user.getSex())
+                        .set(SysUser::getSex, user.getSex())
-                .eq(SysUser::getUserId, user.getUserId()));
+                        .eq(SysUser::getUserId, user.getUserId()));
     }
 
     /**
@@ -402,9 +413,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public boolean updateUserAvatar(Long userId, Long avatar) {
         return baseMapper.update(null,
-            new LambdaUpdateWrapper<SysUser>()
+                new LambdaUpdateWrapper<SysUser>()
-                .set(SysUser::getAvatar, avatar)
+                        .set(SysUser::getAvatar, avatar)
-                .eq(SysUser::getUserId, userId)) > 0;
+                        .eq(SysUser::getUserId, userId)) > 0;
     }
 
     /**
@@ -417,9 +428,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public int resetUserPwd(Long userId, String password) {
         return baseMapper.update(null,
-            new LambdaUpdateWrapper<SysUser>()
+                new LambdaUpdateWrapper<SysUser>()
-                .set(SysUser::getPassword, password)
+                        .set(SysUser::getPassword, password)
-                .eq(SysUser::getUserId, userId));
+                        .eq(SysUser::getUserId, userId));
     }
 
     /**
@@ -471,7 +482,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             }
             // 判断是否具有此角色的操作权限
             List<SysRoleVo> roles = roleMapper.selectRoleList(
-                new QueryWrapper<SysRole>().in("r.role_id", roleList));
+                    new QueryWrapper<SysRole>().in("r.role_id", roleList));
             if (CollUtil.isEmpty(roles)) {
                 throw new ServiceException("没有权限访问角色的数据");
             }
@@ -561,7 +572,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public String selectUserNameById(Long userId) {
         SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getUserName).eq(SysUser::getUserId, userId));
+                .select(SysUser::getUserName).eq(SysUser::getUserId, userId));
         return ObjectUtils.notNullGetter(sysUser, SysUser::getUserName);
     }
 
@@ -575,7 +586,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId")
     public String selectNicknameById(Long userId) {
         SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getNickName).eq(SysUser::getUserId, userId));
+                .select(SysUser::getNickName).eq(SysUser::getUserId, userId));
         return ObjectUtils.notNullGetter(sysUser, SysUser::getNickName);
     }
 
@@ -606,7 +617,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public String selectPhonenumberById(Long userId) {
         SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId));
+                .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId));
         return ObjectUtils.notNullGetter(sysUser, SysUser::getPhonenumber);
     }
 
@@ -619,7 +630,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public String selectEmailById(Long userId) {
         SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getEmail).eq(SysUser::getUserId, userId));
+                .select(SysUser::getEmail).eq(SysUser::getUserId, userId));
         return ObjectUtils.notNullGetter(sysUser, SysUser::getEmail);
     }
 
@@ -635,9 +646,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             return List.of();
         }
         List<SysUserVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber)
+                .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber)
-            .eq(SysUser::getStatus, SystemConstants.NORMAL)
+                .eq(SysUser::getStatus, SystemConstants.NORMAL)
-            .in(SysUser::getUserId, userIds));
+                .in(SysUser::getUserId, userIds));
         return BeanUtil.copyToList(list, UserDTO.class);
     }
 
@@ -653,7 +664,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             return List.of();
         }
         List<SysUserRole> userRoles = userRoleMapper.selectList(
-            new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getRoleId, roleIds));
+                new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getRoleId, roleIds));
         return StreamUtils.toList(userRoles, SysUserRole::getUserId);
     }
 
@@ -671,7 +682,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
 
         // 通过角色ID获取用户角色信息
         List<SysUserRole> userRoles = userRoleMapper.selectList(
-            new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getRoleId, roleIds));
+                new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getRoleId, roleIds));
 
         // 获取用户ID列表
         Set<Long> userIds = StreamUtils.toSet(userRoles, SysUserRole::getUserId);
@@ -691,9 +702,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             return List.of();
         }
         List<SysUserVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber)
+                .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber)
-            .eq(SysUser::getStatus, SystemConstants.NORMAL)
+                .eq(SysUser::getStatus, SystemConstants.NORMAL)
-            .in(SysUser::getDeptId, deptIds));
+                .in(SysUser::getDeptId, deptIds));
         return BeanUtil.copyToList(list, UserDTO.class);
     }
 
@@ -711,7 +722,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
 
         // 通过岗位ID获取用户岗位信息
         List<SysUserPost> userPosts = userPostMapper.selectList(
-            new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getPostId, postIds));
+                new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getPostId, postIds));
 
         // 获取用户ID列表
         Set<Long> userIds = StreamUtils.toSet(userPosts, SysUserPost::getUserId);
@@ -731,11 +742,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             return Collections.emptyMap();
         }
         return baseMapper.selectList(
-                new LambdaQueryWrapper<SysUser>()
+                        new LambdaQueryWrapper<SysUser>()
-                    .select(SysUser::getUserId, SysUser::getNickName)
+                                .select(SysUser::getUserId, SysUser::getNickName)
-                    .in(SysUser::getUserId, userIds)
+                                .in(SysUser::getUserId, userIds)
-            ).stream()
+                ).stream()
-            .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
+                .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
     }
 
     /**
@@ -750,11 +761,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             return Collections.emptyMap();
         }
         return roleMapper.selectList(
-                new LambdaQueryWrapper<SysRole>()
+                        new LambdaQueryWrapper<SysRole>()
-                    .select(SysRole::getRoleId, SysRole::getRoleName)
+                                .select(SysRole::getRoleId, SysRole::getRoleName)
-                    .in(SysRole::getRoleId, roleIds)
+                                .in(SysRole::getRoleId, roleIds)
-            ).stream()
+                ).stream()
-            .collect(Collectors.toMap(SysRole::getRoleId, SysRole::getRoleName));
+                .collect(Collectors.toMap(SysRole::getRoleId, SysRole::getRoleName));
     }
 
     /**
@@ -769,11 +780,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             return Collections.emptyMap();
         }
         return deptMapper.selectList(
-                new LambdaQueryWrapper<SysDept>()
+                        new LambdaQueryWrapper<SysDept>()
-                    .select(SysDept::getDeptId, SysDept::getDeptName)
+                                .select(SysDept::getDeptId, SysDept::getDeptName)
-                    .in(SysDept::getDeptId, deptIds)
+                                .in(SysDept::getDeptId, deptIds)
-            ).stream()
+                ).stream()
-            .collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+                .collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
     }
 
     /**
@@ -788,11 +799,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             return Collections.emptyMap();
         }
         return postMapper.selectList(
-                new LambdaQueryWrapper<SysPost>()
+                        new LambdaQueryWrapper<SysPost>()
-                    .select(SysPost::getPostId, SysPost::getPostName)
+                                .select(SysPost::getPostId, SysPost::getPostName)
-                    .in(SysPost::getPostId, postIds)
+                                .in(SysPost::getPostId, postIds)
-            ).stream()
+                ).stream()
-            .collect(Collectors.toMap(SysPost::getPostId, SysPost::getPostName));
+                .collect(Collectors.toMap(SysPost::getPostId, SysPost::getPostName));
     }
 
 }