lbqms.git - Gitblit

			@@ -37,6 +37,7 @@
			import org.dromara.system.domain.vo.SysUserVo;
			import org.dromara.system.mapper.*;
			import org.dromara.system.service.ISysUserService;
			import org.springframework.cache.annotation.CacheEvict;
			import org.springframework.cache.annotation.Cacheable;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -98,7 +99,7 @@
			w.in("u.dept_id", ids);
			}).orderByAsc("u.user_id");
			if (StringUtils.isNotBlank(user.getExcludeUserIds())) {
			wrapper.notIn("u.user_id", StringUtils.splitList(user.getExcludeUserIds()));
			wrapper.notIn("u.user_id", StringUtils.splitTo(user.getExcludeUserIds(), Convert::toLong));
			}
			return wrapper;
			}
			@@ -338,6 +339,7 @@
			* @return 结果
			*/
			@Override
			@CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId")
			@Transactional(rollbackFor = Exception.class)
			public int updateUser(SysUserBo user) {
			// 新增用户与角色管理
			@@ -386,6 +388,7 @@
			* @param user 用户信息
			* @return 结果
			*/
			@CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId")
			@Override
			public int updateUserProfile(SysUserBo user) {
			return baseMapper.update(null,
			@@ -538,7 +541,7 @@
			// 删除用户与岗位表
			userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId, ids));
			// 防止更新失败导致的数据删除
			int flag = baseMapper.deleteBatchIds(ids);
			int flag = baseMapper.deleteByIds(ids);
			if (flag < 1) {
			throw new ServiceException("删除用户失败!");
			}
			@@ -636,7 +639,10 @@
			if (CollUtil.isEmpty(userIds)) {
			return List.of();
			}
			List<SysUserVo> list = this.selectUserByIds(userIds, null);
			List<SysUserVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysUser>()
			.select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName)
			.eq(SysUser::getStatus, UserConstants.USER_NORMAL)
			.in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds));
			return BeanUtil.copyToList(list, UserDTO.class);
			}