diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java index 8f48cb7..7481534 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java @@ -4,6 +4,7 @@ import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.InnerAuth; @@ -38,6 +39,19 @@ public class SysUserController extends BaseController { @Resource private SysUserService userService; + + /** + * 查询用户列表 + * @param user 条件 + * @return 集合 + */ + @PostMapping("/list") + public Result> list(SysUser user){ + startPage(); + return getDataTable(userService.selectUserList(user)); + } + + @InnerAuth @GetMapping("/info") public Result info ( diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java index 6dab258..4ee3d58 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java +++ b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java @@ -4,6 +4,8 @@ package com.muyu.system.saas.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysUser; +import java.util.List; + /** * @Author: 胡杨 @@ -38,4 +40,6 @@ public interface SysUserService extends IService { * @param user 用户对象 */ public void insertUserRole (SysUser user); + + List selectUserList(SysUser user); } diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java index 559cf9b..af95dc6 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java @@ -103,6 +103,15 @@ public class SysUserServiceImpl extends ServiceImpl this.insertUserRole(user.getUserId(), user.getRoleIds()); } + @Override + public List selectUserList(SysUser user) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like( + StringUtils.isNotEmpty(user.getUserName()), + SysUser::getUserName, user.getUserName()); + return this.list(queryWrapper); + } + /** * 新增用户角色信息 *