mirror of
https://gitee.com/dromara/RuoYi-Cloud-Plus.git
synced 2026-04-25 15:08:34 +08:00
!164 从vue版本迁移flowable到cloud版本
* update 按照vue版逻辑改造工作流 * update 去除泛化调用逻辑 * update 更改 工作流 测试用例接口路径 * fix 去除无用修改,还原demo,testLeave挪入工作流模块 * fix 清理无效代码,还原配置 * update 修改监听器属性名 * update 集成工作流
This commit is contained in:
@@ -14,6 +14,7 @@ import org.dromara.common.mybatis.helper.DataPermissionHelper;
|
||||
import org.dromara.common.tenant.helper.TenantHelper;
|
||||
import org.dromara.system.api.RemoteUserService;
|
||||
import org.dromara.system.api.domain.bo.RemoteUserBo;
|
||||
import org.dromara.system.api.domain.dto.UserDTO;
|
||||
import org.dromara.system.api.model.LoginUser;
|
||||
import org.dromara.system.api.model.RoleDTO;
|
||||
import org.dromara.system.api.model.XcxLoginUser;
|
||||
@@ -234,4 +235,15 @@ public class RemoteUserServiceImpl implements RemoteUserService {
|
||||
DataPermissionHelper.ignore(() -> userMapper.updateById(sysUser));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UserDTO> selectListByIds(List<Long> userIds) {
|
||||
List<SysUserVo> sysUserVos = userService.selectUserByIds(userIds, null);
|
||||
return BeanUtil.copyToList(sysUserVos, UserDTO.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Long> selectUserIdsByRoleIds(List<Long> roleIds) {
|
||||
return userService.selectUserIdsByRoleIds(roleIds);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -252,4 +252,11 @@ public interface ISysUserService {
|
||||
*/
|
||||
List<SysUserVo> selectUserListByDept(Long deptId);
|
||||
|
||||
/**
|
||||
* 通过角色ID查询用户ID
|
||||
*
|
||||
* @param roleIds 角色ids
|
||||
* @return 用户ids
|
||||
*/
|
||||
List<Long> selectUserIdsByRoleIds(List<Long> roleIds);
|
||||
}
|
||||
|
||||
@@ -553,6 +553,13 @@ public class SysUserServiceImpl implements ISysUserService {
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
@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);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过用户ID查询用户账户
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user