Bladeren bron

feat:
新增用户、组织非分页接口

18339543638 2 jaren geleden
bovenliggende
commit
2ea079c11c

+ 1 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/controller/SysOrgController.java

@@ -52,6 +52,7 @@ public class SysOrgController extends BaseController {
     @ApiOperationSupport(author = "lf")
     @ApiOperation(value = "根据条件查询组织(不分页)",notes = "权限: 无")
     public CommonResult<List<SysOrgDTO>> selectList(@RequestBody SysOrgQueryDTO query){
+        query.setDisable(false);
         return CommonResult.success(orgService.selectSysOrgList(query));
     }
 

+ 2 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/controller/SysUserController.java

@@ -6,6 +6,7 @@ import cn.tr.core.pojo.TableDataInfo;
 import cn.tr.core.validation.Insert;
 import cn.tr.core.validation.Update;
 import cn.tr.module.sys.user.dto.*;
+import cn.tr.module.sys.user.enums.UserStatusEnum;
 import cn.tr.module.sys.user.mapper.SysUserMapper;
 import cn.tr.module.sys.user.service.ISysUserService;
 import cn.tr.plugin.mybatis.base.BaseController;
@@ -62,6 +63,7 @@ public class SysUserController extends BaseController {
     @ApiOperationSupport(author = "lf")
     @ApiOperation(value = "根据条件查询用户(不分页)",notes = "权限: 无")
     public CommonResult<List<SysUserSmallDTO>> selectList(@RequestBody SysUserQueryDTO query){
+        query.setStatus(UserStatusEnum.normal.getValue());
         return CommonResult.success(SysUserMapper.INSTANCE.toUserSmallDTOList(userService.selectSysUserList(query)));
     }
 

+ 3 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysUserQueryDTO.java

@@ -25,4 +25,7 @@ public class SysUserQueryDTO implements Serializable {
     private String phone;
     @ApiModelProperty("昵称")
     private String nickname;
+
+    @ApiModelProperty("用户状态")
+    private String status;
 }

+ 1 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysUserServiceImpl.java

@@ -61,6 +61,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepository,SysUserPO>
     public List<SysUserDTO> selectSysUserList(SysUserQueryDTO query) {
         return SysUserMapper.INSTANCE.toUserDTOList(baseMapper.selectList(
                 new LambdaQueryWrapper<SysUserPO>()
+                        .eq(StrUtil.isNotEmpty(query.getStatus()),SysUserPO::getStatus,query.getStatus())
                         .eq(StrUtil.isNotEmpty(query.getOrgId()),SysUserPO::getOrgId,query.getOrgId())
                         .like(StrUtil.isNotEmpty(query.getNickname()),SysUserPO::getNickname,query.getNickname())
                         .like(StrUtil.isNotEmpty(query.getPhone()),SysUserPO::getPhone,query.getPhone())