From c5742cff79bc718ffb29ec508b6ab5384c840763 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sun, 21 Jan 2024 21:04:30 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkflowUserController.java | 18 ++++++++++++++---- .../service/IWorkflowUserService.java | 11 +++++++++++ .../service/impl/WorkflowUserServiceImpl.java | 19 +++++++++++++++++++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java index 36430ecab..78f808fca 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java @@ -2,17 +2,16 @@ package org.dromara.workflow.controller; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.workflow.domain.bo.SysUserMultiBo; import org.dromara.workflow.domain.vo.TaskVo; import org.dromara.workflow.service.IWorkflowUserService; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -59,4 +58,15 @@ public class WorkflowUserController extends BaseController { public R> getUserListByIds(@PathVariable List userIds) { return R.ok(workflowUserService.getUserListByIds(userIds)); } + + /** + * 分页查询用户 + * + * @param sysUserBo 参数 + * @param pageQuery 分页 + */ + @GetMapping("/getUserListByPage") + public TableDataInfo getUserListByPage(SysUserBo sysUserBo, PageQuery pageQuery) { + return workflowUserService.getUserListByPage(sysUserBo, pageQuery); + } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java index d167163b8..3c915727a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java @@ -1,7 +1,9 @@ package org.dromara.workflow.service; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.domain.SysUserRole; +import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.workflow.domain.bo.SysUserMultiBo; import org.dromara.workflow.domain.vo.TaskVo; @@ -46,4 +48,13 @@ public interface IWorkflowUserService { * @return 结果 */ List getUserRoleListByRoleIds(List roleIds); + + /** + * 分页查询用户 + * + * @param sysUserBo 参数 + * @param pageQuery 分页 + * @return 结果 + */ + TableDataInfo getUserListByPage(SysUserBo sysUserBo, PageQuery pageQuery); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java index 8208203c3..647e6d4d7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java @@ -10,10 +10,12 @@ import org.dromara.common.core.enums.UserStatus; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.SysUserRole; +import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.mapper.SysUserRoleMapper; @@ -191,4 +193,21 @@ public class WorkflowUserServiceImpl implements IWorkflowUserService { public List getUserRoleListByRoleIds(List roleIds) { return sysUserRoleMapper.selectList(new LambdaQueryWrapper().in(SysUserRole::getRoleId, roleIds)); } + + /** + * 分页查询用户 + * + * @param sysUserBo 参数 + * @param pageQuery 分页 + */ + @Override + public TableDataInfo getUserListByPage(SysUserBo sysUserBo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(sysUserBo.getDeptId() != null, SysUser::getDeptId, sysUserBo.getDeptId()); + queryWrapper.eq(SysUser::getStatus, UserStatus.OK.getCode()); + queryWrapper.like(StringUtils.isNotEmpty(sysUserBo.getUserName()), SysUser::getUserName, sysUserBo.getUserName()); + queryWrapper.like(StringUtils.isNotEmpty(sysUserBo.getNickName()), SysUser::getNickName, sysUserBo.getNickName()); + Page userPage = sysUserMapper.selectVoPage(pageQuery.build(), queryWrapper); + return TableDataInfo.build(recordPage(userPage)); + } }