From cb296ef2cd5f00b5593e3691ff7681a1dcfbd9d4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 09 五月 2024 15:09:54 +0800
Subject: [PATCH] update 重构 workflow 模块与 system 模块解耦
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
index ad73de4..93f1cc7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
@@ -1,5 +1,6 @@
package org.dromara.system.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ArrayUtil;
@@ -14,6 +15,7 @@
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.constant.UserConstants;
+import org.dromara.common.core.domain.dto.UserDTO;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.UserService;
import org.dromara.common.core.utils.MapstructUtils;
@@ -29,7 +31,10 @@
import org.dromara.system.domain.SysUserPost;
import org.dromara.system.domain.SysUserRole;
import org.dromara.system.domain.bo.SysUserBo;
-import org.dromara.system.domain.vo.*;
+import org.dromara.system.domain.vo.SysPostVo;
+import org.dromara.system.domain.vo.SysRoleVo;
+import org.dromara.system.domain.vo.SysUserExportVo;
+import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.*;
import org.dromara.system.service.ISysUserService;
import org.springframework.cache.annotation.Cacheable;
@@ -92,6 +97,9 @@
ids.add(user.getDeptId());
w.in("u.dept_id", ids);
}).orderByAsc("u.user_id");
+ if (StringUtils.isNotBlank(user.getExcludeUserIds())) {
+ wrapper.notIn("u.user_id", StringUtils.splitList(user.getExcludeUserIds()));
+ }
return wrapper;
}
@@ -623,4 +631,20 @@
return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail();
}
+ @Override
+ public List<UserDTO> selectListByIds(List<Long> userIds) {
+ if (CollUtil.isEmpty(userIds)) {
+ return List.of();
+ }
+ List<SysUserVo> list = this.selectUserByIds(userIds, null);
+ return BeanUtil.copyToList(list, UserDTO.class);
+ }
+
+ @Override
+ public List<Long> selectUserIdsByRoleIds(List<Long> roleIds) {
+ List<SysUserRole> userRoles = userRoleMapper.selectList(
+ new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getRoleId, roleIds));
+ return StreamUtils.toList(userRoles, SysUserRole::getUserId);
+ }
+
}
--
Gitblit v1.9.3