diff --git a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java index f745427d..42fce25a 100644 --- a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java +++ b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java @@ -14,6 +14,7 @@ package vip.xiaonuo.sys.api; import cn.hutool.core.lang.tree.Tree; import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -55,5 +56,5 @@ public interface SysOrgApi { * @author xuyuxiang * @date 2022/7/22 14:45 **/ - List orgListSelector(String parentId); + Page orgListSelector(String parentId); } diff --git a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysPositionApi.java b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysPositionApi.java index ecd5e7d8..9be0875e 100644 --- a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysPositionApi.java +++ b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysPositionApi.java @@ -13,6 +13,7 @@ package vip.xiaonuo.sys.api; import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -38,5 +39,5 @@ public interface SysPositionApi { * @author xuyuxiang * @date 2022/7/22 14:47 **/ - List positionSelector(String orgId, String searchKey); + Page positionSelector(String orgId, String searchKey); } diff --git a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRoleApi.java b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRoleApi.java index b0fdab2a..1fb74dae 100644 --- a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRoleApi.java +++ b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRoleApi.java @@ -13,6 +13,7 @@ package vip.xiaonuo.sys.api; import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -38,7 +39,7 @@ public interface SysRoleApi { * @author xuyuxiang * @date 2022/7/22 14:49 **/ - List roleSelector(String orgId, String category, String searchKey); + Page roleSelector(String orgId, String category, String searchKey, List dataScopeList); /** * 代码生成菜单按钮授权 diff --git a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysUserApi.java b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysUserApi.java index 85d60196..8426eb39 100644 --- a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysUserApi.java +++ b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysUserApi.java @@ -13,6 +13,7 @@ package vip.xiaonuo.sys.api; import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -102,5 +103,5 @@ public interface SysUserApi { * @author xuyuxiang * @date 2022/4/24 20:08 */ - List userSelector(String orgId, String searchKey); + Page userSelector(String orgId, String searchKey); } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/controller/BizOrgController.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/controller/BizOrgController.java index eda10fbd..d142d8da 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/controller/BizOrgController.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/controller/BizOrgController.java @@ -169,7 +169,7 @@ public class BizOrgController { @ApiOperation("获取人员选择器") @SaCheckPermission("/biz/org/userSelector") @GetMapping("/biz/org/userSelector") - public CommonResult> userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam) { + public CommonResult> userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam) { return CommonResult.data(bizOrgService.userSelector(bizOrgSelectorUserParam)); } } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorOrgListParam.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorOrgListParam.java index 7494f7ba..f5fea016 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorOrgListParam.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorOrgListParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class BizOrgSelectorOrgListParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 父id */ @ApiModelProperty(value = "父id") private String parentId; diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorUserParam.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorUserParam.java index 0207633f..1ba21852 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorUserParam.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorUserParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class BizOrgSelectorUserParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 机构id */ @ApiModelProperty(value = "机构id") private String orgId; diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java index 93203dd6..6e2a844c 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java @@ -86,7 +86,7 @@ public interface BizOrgService extends IService { BizOrg queryEntity(String id); /** - * 获取缓存的所有机构 + * 获取所有机构 * * @author xuyuxiang * @date 2022/7/25 19:42 @@ -123,5 +123,5 @@ public interface BizOrgService extends IService { * @author xuyuxiang * @date 2022/4/24 20:08 */ - List userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam); + Page userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam); } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java index d99f7d9d..7459fe82 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java @@ -368,17 +368,18 @@ public class BizOrgServiceImpl extends ServiceImpl impleme } @Override - public List userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam) { + public Page userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 校验数据范围 List loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope(); if(ObjectUtil.isNotEmpty(loginUserDataScope)) { lambdaQueryWrapper.in(BizUser::getOrgId, loginUserDataScope); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } // 只查询部分字段 - lambdaQueryWrapper.select(BizUser::getId, BizUser::getOrgId, BizUser::getAccount, BizUser::getName); + lambdaQueryWrapper.select(BizUser::getId, BizUser::getAvatar, BizUser::getOrgId, BizUser::getPositionId, BizUser::getAccount, + BizUser::getName, BizUser::getSortCode, BizUser::getGender, BizUser::getEntryDate); if(ObjectUtil.isNotEmpty(bizOrgSelectorUserParam.getOrgId())) { lambdaQueryWrapper.eq(BizUser::getOrgId, bizOrgSelectorUserParam.getOrgId()); } @@ -386,7 +387,7 @@ public class BizOrgServiceImpl extends ServiceImpl impleme lambdaQueryWrapper.like(BizUser::getName, bizOrgSelectorUserParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(BizUser::getSortCode); - return bizUserService.list(lambdaQueryWrapper); + return bizUserService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } /* ====以下为各种递归方法==== */ diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/controller/BizPositionController.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/controller/BizPositionController.java index ec3b6889..23cc76d0 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/controller/BizPositionController.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/controller/BizPositionController.java @@ -154,7 +154,7 @@ public class BizPositionController { @ApiOperation("获取岗位选择器") @SaCheckPermission("/biz/position/positionSelector") @GetMapping("/biz/position/positionSelector") - public CommonResult> positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam) { + public CommonResult> positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam) { return CommonResult.data(bizPositionService.positionSelector(bizPositionSelectorPositionParam)); } } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/param/BizPositionSelectorPositionParam.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/param/BizPositionSelectorPositionParam.java index bbee748c..115a1f21 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/param/BizPositionSelectorPositionParam.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/param/BizPositionSelectorPositionParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class BizPositionSelectorPositionParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 机构id */ @ApiModelProperty(value = "机构id") private String orgId; diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/BizPositionService.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/BizPositionService.java index c4d4c909..60e5fa6c 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/BizPositionService.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/BizPositionService.java @@ -100,5 +100,5 @@ public interface BizPositionService extends IService { * @author xuyuxiang * @date 2022/4/24 20:08 */ - List positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam); + Page positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam); } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/impl/BizPositionServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/impl/BizPositionServiceImpl.java index ffb381ae..d3e558aa 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/impl/BizPositionServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/impl/BizPositionServiceImpl.java @@ -230,14 +230,14 @@ public class BizPositionServiceImpl extends ServiceImpl positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam) { + public Page positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 校验数据范围 List loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope(); if(ObjectUtil.isNotEmpty(loginUserDataScope)) { lambdaQueryWrapper.in(BizPosition::getOrgId, loginUserDataScope); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } // 查询部分字段 lambdaQueryWrapper.select(BizPosition::getId, BizPosition::getOrgId, BizPosition::getName, @@ -249,6 +249,6 @@ public class BizPositionServiceImpl extends ServiceImpl> orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam) { + public CommonResult> orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam) { return CommonResult.data(bizUserService.orgListSelector(bizUserSelectorOrgListParam)); } @@ -282,7 +282,7 @@ public class BizUserController { @ApiOperation("获取岗位选择器") @SaCheckPermission("/biz/user/positionSelector") @GetMapping("/biz/user/positionSelector") - public CommonResult> positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam) { + public CommonResult> positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam) { return CommonResult.data(bizUserService.positionSelector(bizUserSelectorPositionParam)); } @@ -296,7 +296,7 @@ public class BizUserController { @ApiOperation("获取角色选择器") @SaCheckPermission("/biz/user/roleSelector") @GetMapping("/biz/user/roleSelector") - public CommonResult> roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam) { + public CommonResult> roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam) { return CommonResult.data(bizUserService.roleSelector(bizUserSelectorRoleParam)); } @@ -310,7 +310,7 @@ public class BizUserController { @ApiOperation("获取人员选择器") @SaCheckPermission("/biz/user/userSelector") @GetMapping("/biz/user/userSelector") - public CommonResult> userSelector(BizUserSelectorUserParam bizUserSelectorUserParam) { + public CommonResult> userSelector(BizUserSelectorUserParam bizUserSelectorUserParam) { return CommonResult.data(bizUserService.userSelector(bizUserSelectorUserParam)); } } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorOrgListParam.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorOrgListParam.java index 117200ab..defc6445 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorOrgListParam.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorOrgListParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class BizUserSelectorOrgListParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 父id */ @ApiModelProperty(value = "父id") private String parentId; diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorPositionParam.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorPositionParam.java index 3818a176..dd9a5200 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorPositionParam.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorPositionParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class BizUserSelectorPositionParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 机构id */ @ApiModelProperty(value = "机构id") private String orgId; diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorRoleParam.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorRoleParam.java index c125dae3..b1f14ac0 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorRoleParam.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorRoleParam.java @@ -26,8 +26,16 @@ import lombok.Setter; @Setter public class BizUserSelectorRoleParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 组织id */ - @ApiModelProperty(value = "组织id", position = 1) + @ApiModelProperty(value = "组织id") private String orgId; /** 角色分类 */ diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorUserParam.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorUserParam.java index a6c312d1..e6a4121c 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorUserParam.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorUserParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class BizUserSelectorUserParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 组织id */ @ApiModelProperty(value = "组织id") private String orgId; diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/BizUserService.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/BizUserService.java index 42bea49b..d14a0080 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/BizUserService.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/BizUserService.java @@ -153,7 +153,7 @@ public interface BizUserService extends IService { * @author xuyuxiang * @date 2022/7/22 13:34 **/ - List orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam); + Page orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam); /** * 获取岗位选择器 @@ -161,7 +161,7 @@ public interface BizUserService extends IService { * @author xuyuxiang * @date 2022/5/13 21:00 */ - List positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam); + Page positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam); /** * 获取角色选择器 @@ -169,7 +169,7 @@ public interface BizUserService extends IService { * @author xuyuxiang * @date 2022/5/13 21:00 */ - List roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam); + Page roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam); /** * 获取人员选择器 @@ -177,5 +177,5 @@ public interface BizUserService extends IService { * @author xuyuxiang * @date 2022/4/24 20:08 */ - List userSelector(BizUserSelectorUserParam bizUserSelectorUserParam); + Page userSelector(BizUserSelectorUserParam bizUserSelectorUserParam); } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java index eea0c01d..1889d8ed 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java @@ -625,14 +625,14 @@ public class BizUserServiceImpl extends ServiceImpl impl } @Override - public List orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam) { + public Page orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 校验数据范围 List loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope(); if(ObjectUtil.isNotEmpty(loginUserDataScope)) { lambdaQueryWrapper.in(BizOrg::getId, loginUserDataScope); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } // 查询部分字段 lambdaQueryWrapper.select(BizOrg::getId, BizOrg::getParentId, BizOrg::getName, @@ -644,18 +644,18 @@ public class BizUserServiceImpl extends ServiceImpl impl lambdaQueryWrapper.like(BizOrg::getName, bizUserSelectorOrgListParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(BizOrg::getSortCode); - return bizOrgService.list(lambdaQueryWrapper); + return bizOrgService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } @Override - public List positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam) { + public Page positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 校验数据范围 List loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope(); if(ObjectUtil.isNotEmpty(loginUserDataScope)) { lambdaQueryWrapper.in(BizPosition::getOrgId, loginUserDataScope); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } // 查询部分字段 lambdaQueryWrapper.select(BizPosition::getId, BizPosition::getOrgId, BizPosition::getName, @@ -667,46 +667,44 @@ public class BizUserServiceImpl extends ServiceImpl impl lambdaQueryWrapper.like(BizPosition::getName, bizUserSelectorPositionParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(BizPosition::getSortCode); - return bizPositionService.list(lambdaQueryWrapper); + return bizPositionService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } + @SuppressWarnings("ALL") @Override - public List roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam) { + public Page roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam) { // 校验数据范围 List loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope(); if(ObjectUtil.isNotEmpty(loginUserDataScope)) { if(ObjectUtil.isNotEmpty(bizUserSelectorRoleParam.getOrgId())) { if(loginUserDataScope.contains(bizUserSelectorRoleParam.getOrgId())) { - return sysRoleApi.roleSelector(bizUserSelectorRoleParam.getOrgId(), bizUserSelectorRoleParam.getCategory(), - bizUserSelectorRoleParam.getSearchKey()).stream().map(jsonObject -> - JSONUtil.toBean(jsonObject, BizUserRoleResult.class)).collect(Collectors.toList()); + return BeanUtil.toBean(sysRoleApi.roleSelector(bizUserSelectorRoleParam.getOrgId(), bizUserSelectorRoleParam.getCategory(), + bizUserSelectorRoleParam.getSearchKey(), loginUserDataScope), Page.class); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } } else { - return sysRoleApi.roleSelector(bizUserSelectorRoleParam.getOrgId(), bizUserSelectorRoleParam.getCategory(), - bizUserSelectorRoleParam.getSearchKey()).stream().map(jsonObject -> - JSONUtil.toBean(jsonObject, BizUserRoleResult.class)).filter(bizUserRoleResult -> ObjectUtil - .isNotEmpty(bizUserRoleResult.getOrgId()) && loginUserDataScope.contains(bizUserRoleResult.getOrgId())) - .collect(Collectors.toList()); + return BeanUtil.toBean(sysRoleApi.roleSelector(bizUserSelectorRoleParam.getOrgId(), bizUserSelectorRoleParam.getCategory(), + bizUserSelectorRoleParam.getSearchKey(), loginUserDataScope), Page.class); } } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } } @Override - public List userSelector(BizUserSelectorUserParam bizUserSelectorUserParam) { + public Page userSelector(BizUserSelectorUserParam bizUserSelectorUserParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 校验数据范围 List loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope(); if(ObjectUtil.isNotEmpty(loginUserDataScope)) { lambdaQueryWrapper.in(BizUser::getOrgId, loginUserDataScope); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } // 只查询部分字段 - lambdaQueryWrapper.select(BizUser::getId, BizUser::getOrgId, BizUser::getAccount, BizUser::getName, BizUser::getSortCode); + lambdaQueryWrapper.select(BizUser::getId, BizUser::getAvatar, BizUser::getOrgId, BizUser::getPositionId, BizUser::getAccount, + BizUser::getName, BizUser::getSortCode, BizUser::getGender, BizUser::getEntryDate); if(ObjectUtil.isNotEmpty(bizUserSelectorUserParam.getOrgId())) { lambdaQueryWrapper.eq(BizUser::getOrgId, bizUserSelectorUserParam.getOrgId()); } @@ -714,6 +712,6 @@ public class BizUserServiceImpl extends ServiceImpl impl lambdaQueryWrapper.like(BizUser::getName, bizUserSelectorUserParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(BizUser::getSortCode); - return this.list(lambdaQueryWrapper); + return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java index f4e5a0c8..bc2186bc 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java @@ -160,7 +160,7 @@ public class SysOrgController { @ApiOperationSupport(order = 8) @ApiOperation("获取用户选择器") @GetMapping("/sys/org/userSelector") - public CommonResult> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam) { + public CommonResult> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam) { return CommonResult.data(sysOrgService.userSelector(sysOrgSelectorUserParam)); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorOrgListParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorOrgListParam.java index 9a451e67..2e19bd8b 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorOrgListParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorOrgListParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class SysOrgSelectorOrgListParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 父id */ @ApiModelProperty(value = "父id") private String parentId; diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorUserParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorUserParam.java index 0ffc5f7a..33696fc7 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorUserParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorUserParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class SysOrgSelectorUserParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 组织id */ @ApiModelProperty(value = "组织id") private String orgId; diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java index 1692027b..7c4066c3 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java @@ -12,10 +12,12 @@ */ package vip.xiaonuo.sys.modular.org.provider; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; import vip.xiaonuo.sys.api.SysOrgApi; import vip.xiaonuo.sys.modular.org.entity.SysOrg; @@ -57,10 +59,11 @@ public class SysOrgApiProvider implements SysOrgApi { return sysOrgService.orgTreeSelector(); } + @SuppressWarnings("ALL") @Override - public List orgListSelector(String parentId) { + public Page orgListSelector(String parentId) { SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam = new SysOrgSelectorOrgListParam(); sysOrgSelectorOrgListParam.setParentId(parentId); - return sysOrgService.orgListSelector(sysOrgSelectorOrgListParam).stream().map(JSONUtil::parseObj).collect(Collectors.toList()); + return BeanUtil.toBean(sysOrgService.orgListSelector(sysOrgSelectorOrgListParam), Page.class); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/SysOrgService.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/SysOrgService.java index 0bc20bc9..172c32fb 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/SysOrgService.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/SysOrgService.java @@ -86,7 +86,7 @@ public interface SysOrgService extends IService { SysOrg queryEntity(String id); /** - * 获取缓存的所有组织 + * 获取所有组织 * * @author xuyuxiang * @date 2022/7/25 19:42 @@ -163,7 +163,7 @@ public interface SysOrgService extends IService { * @author xuyuxiang * @date 2022/7/22 13:34 **/ - List orgListSelector(SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam); + Page orgListSelector(SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam); /** * 获取用户选择器 @@ -171,5 +171,5 @@ public interface SysOrgService extends IService { * @author xuyuxiang * @date 2022/4/24 20:08 */ - List userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam); + Page userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam); } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java index d23ddde6..0aee24f7 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java @@ -288,7 +288,7 @@ public class SysOrgServiceImpl extends ServiceImpl impleme } @Override - public List orgListSelector(SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam) { + public Page orgListSelector(SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 查询部分字段 lambdaQueryWrapper.select(SysOrg::getId, SysOrg::getParentId, SysOrg::getName, @@ -300,15 +300,16 @@ public class SysOrgServiceImpl extends ServiceImpl impleme lambdaQueryWrapper.like(SysOrg::getName, sysOrgSelectorOrgListParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(SysOrg::getSortCode); - return this.list(lambdaQueryWrapper); + return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } @Override - public List userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam) { + public Page userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 只查询部分字段 - lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode); - // 如果查询条件为空,则从缓存中查询 + lambdaQueryWrapper.select(SysUser::getId, SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount, + SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate); + // 如果查询条件为空,则直接查询 if(ObjectUtil.isAllEmpty(sysOrgSelectorUserParam.getOrgId(), sysOrgSelectorUserParam.getSearchKey())) { return sysUserService.getCachedAllUserSelectorList(); } else { @@ -319,14 +320,14 @@ public class SysOrgServiceImpl extends ServiceImpl impleme if (ObjectUtil.isNotEmpty(parentAndChildOrgIdList)) { lambdaQueryWrapper.in(SysUser::getOrgId, parentAndChildOrgIdList); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } } if(ObjectUtil.isNotEmpty(sysOrgSelectorUserParam.getSearchKey())) { lambdaQueryWrapper.like(SysUser::getName, sysOrgSelectorUserParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(SysUser::getSortCode); - return sysUserService.list(lambdaQueryWrapper); + return sysUserService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/controller/SysPositionController.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/controller/SysPositionController.java index c704b10c..5c98e2fc 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/controller/SysPositionController.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/controller/SysPositionController.java @@ -146,7 +146,7 @@ public class SysPositionController { @ApiOperationSupport(order = 7) @ApiOperation("获取职位选择器") @GetMapping("/sys/position/positionSelector") - public CommonResult> positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam) { + public CommonResult> positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam) { return CommonResult.data(sysPositionService.positionSelector(sysPositionSelectorPositionParam)); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/param/SysPositionSelectorPositionParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/param/SysPositionSelectorPositionParam.java index d185c9f7..cc66d2d5 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/param/SysPositionSelectorPositionParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/param/SysPositionSelectorPositionParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class SysPositionSelectorPositionParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 组织id */ @ApiModelProperty(value = "组织id") private String orgId; diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/provider/SysPositionApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/provider/SysPositionApiProvider.java index d1546341..3ba075a4 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/provider/SysPositionApiProvider.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/provider/SysPositionApiProvider.java @@ -12,8 +12,10 @@ */ package vip.xiaonuo.sys.modular.position.provider; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; import vip.xiaonuo.sys.api.SysPositionApi; import vip.xiaonuo.sys.modular.position.param.SysPositionSelectorPositionParam; @@ -40,11 +42,12 @@ public class SysPositionApiProvider implements SysPositionApi { return sysPositionService.queryEntity(positionId).getName(); } + @SuppressWarnings("ALL") @Override - public List positionSelector(String orgId, String searchKey) { + public Page positionSelector(String orgId, String searchKey) { SysPositionSelectorPositionParam sysPositionSelectorPositionParam = new SysPositionSelectorPositionParam(); sysPositionSelectorPositionParam.setOrgId(orgId); sysPositionSelectorPositionParam.setSearchKey(searchKey); - return sysPositionService.positionSelector(sysPositionSelectorPositionParam).stream().map(JSONUtil::parseObj).collect(Collectors.toList()); + return BeanUtil.toBean(sysPositionService.positionSelector(sysPositionSelectorPositionParam), Page.class); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/SysPositionService.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/SysPositionService.java index c3d5f4cc..02a6e9bf 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/SysPositionService.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/SysPositionService.java @@ -108,5 +108,5 @@ public interface SysPositionService extends IService { * @author xuyuxiang * @date 2022/4/24 20:08 */ - List positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam); + Page positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam); } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/impl/SysPositionServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/impl/SysPositionServiceImpl.java index 84d6a801..47cdb4f4 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/impl/SysPositionServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/impl/SysPositionServiceImpl.java @@ -203,7 +203,7 @@ public class SysPositionServiceImpl extends ServiceImpl positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam) { + public Page positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 查询部分字段 lambdaQueryWrapper.select(SysPosition::getId, SysPosition::getOrgId, SysPosition::getName, @@ -215,6 +215,6 @@ public class SysPositionServiceImpl extends ServiceImpl> roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam) { + public CommonResult> roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam) { return CommonResult.data(sysRoleService.roleSelector(sysRoleSelectorRoleParam)); } @@ -312,7 +312,7 @@ public class SysRoleController { @ApiOperationSupport(order = 19) @ApiOperation("获取用户选择器") @GetMapping("/sys/role/userSelector") - public CommonResult> userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam) { + public CommonResult> userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam) { return CommonResult.data(sysRoleService.userSelector(sysRoleSelectorUserParam)); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorRoleParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorRoleParam.java index 1b932f27..581170ed 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorRoleParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorRoleParam.java @@ -16,6 +16,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import javax.validation.constraints.NotNull; +import java.util.List; + /** * 角色选择器参数 * @@ -26,6 +29,14 @@ import lombok.Setter; @Setter public class SysRoleSelectorRoleParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 组织id */ @ApiModelProperty(value = "组织id") private String orgId; @@ -37,4 +48,8 @@ public class SysRoleSelectorRoleParam { /** 名称关键词 */ @ApiModelProperty(value = "名称关键词") private String searchKey; + + /** 数据范围信息 */ + @ApiModelProperty(value = "数据范围信息") + private List dataScopeList; } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorUserParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorUserParam.java index 0d76e561..35a4d507 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorUserParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorUserParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class SysRoleSelectorUserParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 组织id */ @ApiModelProperty(value = "组织id") private String orgId; diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/provider/SysRoleApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/provider/SysRoleApiProvider.java index 64a32b40..2df57019 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/provider/SysRoleApiProvider.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/provider/SysRoleApiProvider.java @@ -12,11 +12,13 @@ */ package vip.xiaonuo.sys.modular.role.provider; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.sys.api.SysRoleApi; @@ -65,13 +67,15 @@ public class SysRoleApiProvider implements SysRoleApi { return sysRoleService.count(new LambdaQueryWrapper().in(SysRole::getOrgId, orgIdList)) > 0; } + @SuppressWarnings("ALL") @Override - public List roleSelector(String orgId, String category, String searchKey) { + public Page roleSelector(String orgId, String category, String searchKey, List dataScopeList) { SysRoleSelectorRoleParam sysRoleSelectorRoleParam = new SysRoleSelectorRoleParam(); sysRoleSelectorRoleParam.setOrgId(orgId); sysRoleSelectorRoleParam.setCategory(category); sysRoleSelectorRoleParam.setSearchKey(searchKey); - return sysRoleService.roleSelector(sysRoleSelectorRoleParam).stream().map(JSONUtil::parseObj).collect(Collectors.toList()); + sysRoleSelectorRoleParam.setDataScopeList(dataScopeList); + return BeanUtil.toBean(sysRoleService.roleSelector(sysRoleSelectorRoleParam), Page.class); } @Transactional(rollbackFor = Exception.class) diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/SysRoleService.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/SysRoleService.java index eab15cc1..71286ed3 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/SysRoleService.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/SysRoleService.java @@ -182,7 +182,7 @@ public interface SysRoleService extends IService { * @author xuyuxiang * @date 2022/4/24 20:08 */ - List roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam); + Page roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam); /** * 获取用户选择器 @@ -190,5 +190,5 @@ public interface SysRoleService extends IService { * @author xuyuxiang * @date 2022/8/22 13:39 **/ - List userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam); + Page userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam); } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java index 5d423a1e..a7d99759 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java @@ -428,7 +428,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl } @Override - public List roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam) { + public Page roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 查询部分字段 lambdaQueryWrapper.select(SysRole::getId, SysRole::getOrgId, SysRole::getName, @@ -442,16 +442,20 @@ public class SysRoleServiceImpl extends ServiceImpl impl if(ObjectUtil.isNotEmpty(sysRoleSelectorRoleParam.getSearchKey())) { lambdaQueryWrapper.like(SysRole::getName, sysRoleSelectorRoleParam.getSearchKey()); } + if(ObjectUtil.isNotEmpty(sysRoleSelectorRoleParam.getDataScopeList())) { + lambdaQueryWrapper.in(SysRole::getOrgId, sysRoleSelectorRoleParam.getDataScopeList()); + } lambdaQueryWrapper.orderByAsc(SysRole::getSortCode); - return this.list(lambdaQueryWrapper); + return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } @Override - public List userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam) { + public Page userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 只查询部分字段 - lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode); - // 如果查询条件为空,则从缓存中查询 + lambdaQueryWrapper.select(SysUser::getId, SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount, + SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate); + // 如果查询条件为空,则直接查询 if(ObjectUtil.isAllEmpty(sysRoleSelectorUserParam.getOrgId(), sysRoleSelectorUserParam.getSearchKey())) { return sysUserService.getCachedAllUserSelectorList(); } else { @@ -462,14 +466,14 @@ public class SysRoleServiceImpl extends ServiceImpl impl if (ObjectUtil.isNotEmpty(parentAndChildOrgIdList)) { lambdaQueryWrapper.in(SysUser::getOrgId, parentAndChildOrgIdList); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } } if (ObjectUtil.isNotEmpty(sysRoleSelectorUserParam.getSearchKey())) { lambdaQueryWrapper.like(SysUser::getName, sysRoleSelectorUserParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(SysUser::getSortCode); - return sysUserService.list(lambdaQueryWrapper); + return sysUserService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java index 8db8433c..cb6aa3cf 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java @@ -25,6 +25,10 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import vip.xiaonuo.common.annotation.CommonLog; import vip.xiaonuo.common.pojo.CommonResult; +import vip.xiaonuo.sys.modular.org.entity.SysOrg; +import vip.xiaonuo.sys.modular.position.entity.SysPosition; +import vip.xiaonuo.sys.modular.role.entity.SysRole; +import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.param.*; import vip.xiaonuo.sys.modular.user.result.SysUserMessageDetailResult; import vip.xiaonuo.sys.modular.user.result.SysUserMessageResult; @@ -294,4 +298,56 @@ public class SysUserCenterController { public CommonResult loginMessageDetail(@Valid SysUserMessageIdParam sysUserMessageIdParam) { return CommonResult.data(sysUserService.loginMessageDetail(sysUserMessageIdParam)); } + + /** + * 根据id集合获取组织集合 + * + * @author xuyuxiang + * @date 2022/4/24 20:00 + */ + @ApiOperationSupport(order = 18) + @ApiOperation("根据id集合获取组织集合") + @PostMapping("/sys/userCenter/getOrgListByIdList") + public CommonResult> getOrgListByIdList(@RequestBody @Valid SysUserIdListParam sysUserIdListParam) { + return CommonResult.data(sysUserService.getOrgListByIdList(sysUserIdListParam)); + } + + /** + * 根据id集合获取用户集合 + * + * @author xuyuxiang + * @date 2022/4/24 20:00 + */ + @ApiOperationSupport(order = 19) + @ApiOperation("根据id集合获取用户集合") + @PostMapping("/sys/userCenter/getUserListByIdList") + public CommonResult> getUserListByIdList(@RequestBody @Valid SysUserIdListParam sysUserIdListParam) { + return CommonResult.data(sysUserService.getUserListByIdList(sysUserIdListParam)); + } + + /** + * 根据id集合获取职位集合 + * + * @author xuyuxiang + * @date 2022/4/24 20:00 + */ + @ApiOperationSupport(order = 20) + @ApiOperation("根据id集合获取职位集合") + @PostMapping("/sys/userCenter/getPositionListByIdList") + public CommonResult> getPositionListByIdList(@RequestBody @Valid SysUserIdListParam sysUserIdListParam) { + return CommonResult.data(sysUserService.getPositionListByIdList(sysUserIdListParam)); + } + + /** + * 根据id集合获取角色集合 + * + * @author xuyuxiang + * @date 2022/4/24 20:00 + */ + @ApiOperationSupport(order = 21) + @ApiOperation("根据id集合获取角色集合") + @PostMapping("/sys/userCenter/getRoleListByIdList") + public CommonResult> getRoleListByIdList(@RequestBody @Valid SysUserIdListParam sysUserIdListParam) { + return CommonResult.data(sysUserService.getRoleListByIdList(sysUserIdListParam)); + } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java index 3e1a8e7f..778926c4 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java @@ -339,7 +339,7 @@ public class SysUserController { @ApiOperationSupport(order = 20) @ApiOperation("获取组织列表选择器") @GetMapping("/sys/user/orgListSelector") - public CommonResult> orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam) { + public CommonResult> orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam) { return CommonResult.data(sysUserService.orgListSelector(sysUserSelectorOrgListParam)); } @@ -352,7 +352,7 @@ public class SysUserController { @ApiOperationSupport(order = 21) @ApiOperation("获取职位选择器") @GetMapping("/sys/user/positionSelector") - public CommonResult> positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam) { + public CommonResult> positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam) { return CommonResult.data(sysUserService.positionSelector(sysUserSelectorPositionParam)); } @@ -365,7 +365,7 @@ public class SysUserController { @ApiOperationSupport(order = 22) @ApiOperation("获取角色选择器") @GetMapping("/sys/user/roleSelector") - public CommonResult> roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam) { + public CommonResult> roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam) { return CommonResult.data(sysUserService.roleSelector(sysUserSelectorRoleParam)); } @@ -378,7 +378,7 @@ public class SysUserController { @ApiOperationSupport(order = 23) @ApiOperation("获取用户选择器") @GetMapping("/sys/user/userSelector") - public CommonResult> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam) { + public CommonResult> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam) { return CommonResult.data(sysUserService.userSelector(sysUserSelectorUserParam)); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserIdListParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserIdListParam.java new file mode 100644 index 00000000..06279fc6 --- /dev/null +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserIdListParam.java @@ -0,0 +1,37 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点: + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。 + * 4.分发源码时候,请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip + */ +package vip.xiaonuo.sys.modular.user.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 用户id集合参数 + * + * @author xuyuxiang + * @date 2022/4/21 16:13 + **/ +@Getter +@Setter +public class SysUserIdListParam { + + /** id集合 */ + @ApiModelProperty(value = "id集合", required = true) + @NotNull(message = "idList不能为空") + private List idList; +} diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorOrgListParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorOrgListParam.java index fc3a03dd..746b10b1 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorOrgListParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorOrgListParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class SysUserSelectorOrgListParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 父id */ @ApiModelProperty(value = "父id") private String parentId; diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorPositionParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorPositionParam.java index e60a0864..d4ef541c 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorPositionParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorPositionParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class SysUserSelectorPositionParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 组织id */ @ApiModelProperty(value = "组织id") private String orgId; diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorRoleParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorRoleParam.java index 097e7ae8..022a9da8 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorRoleParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorRoleParam.java @@ -26,8 +26,16 @@ import lombok.Setter; @Setter public class SysUserSelectorRoleParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 组织id */ - @ApiModelProperty(value = "组织id", position = 1) + @ApiModelProperty(value = "组织id") private String orgId; /** 角色分类 */ diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorUserParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorUserParam.java index bf5ad620..18c7f549 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorUserParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorUserParam.java @@ -26,6 +26,14 @@ import lombok.Setter; @Setter public class SysUserSelectorUserParam { + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + /** 组织id */ @ApiModelProperty(value = "组织id") private String orgId; diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java index 46047c2f..f4c52e48 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java @@ -12,11 +12,13 @@ */ package vip.xiaonuo.sys.modular.user.provider; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; import vip.xiaonuo.common.exception.CommonException; import vip.xiaonuo.sys.api.SysUserApi; @@ -136,11 +138,12 @@ public class SysUserApiProvider implements SysUserApi { return result.get(); } + @SuppressWarnings("ALL") @Override - public List userSelector(String orgId, String searchKey) { + public Page userSelector(String orgId, String searchKey) { SysUserSelectorUserParam sysUserSelectorUserParam = new SysUserSelectorUserParam(); sysUserSelectorUserParam.setOrgId(orgId); sysUserSelectorUserParam.setSearchKey(searchKey); - return sysUserService.userSelector(sysUserSelectorUserParam).stream().map(JSONUtil::parseObj).collect(Collectors.toList()); + return BeanUtil.toBean(sysUserService.userSelector(sysUserSelectorUserParam), Page.class); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java index 64fb2c8e..d322f9b2 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java @@ -381,12 +381,12 @@ public interface SysUserService extends IService { List loginPositionInfo(SysUserIdParam sysUserIdParam); /** - * 获取缓存的所有用户选择器 + * 获取所有用户选择器 * * @author xuyuxiang * @date 2022/7/25 19:42 **/ - List getCachedAllUserSelectorList(); + Page getAllUserSelectorList(); /* ====用户部分所需要用到的选择器==== */ @@ -404,7 +404,7 @@ public interface SysUserService extends IService { * @author xuyuxiang * @date 2022/7/22 13:34 **/ - List orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam); + Page orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam); /** * 获取职位选择器 @@ -412,7 +412,7 @@ public interface SysUserService extends IService { * @author xuyuxiang * @date 2022/5/13 21:00 */ - List positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam); + Page positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam); /** * 获取角色选择器 @@ -420,7 +420,7 @@ public interface SysUserService extends IService { * @author xuyuxiang * @date 2022/5/13 21:00 */ - List roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam); + Page roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam); /** * 获取用户选择器 @@ -428,7 +428,7 @@ public interface SysUserService extends IService { * @author xuyuxiang * @date 2022/4/24 20:08 */ - List userSelector(SysUserSelectorUserParam sysUserSelectorUserParam); + Page userSelector(SysUserSelectorUserParam sysUserSelectorUserParam); /** * 获取登录用户的站内信分页 @@ -445,4 +445,36 @@ public interface SysUserService extends IService { * @date 2022/9/6 17:39 */ SysUserMessageDetailResult loginMessageDetail(SysUserMessageIdParam sysUserMessageIdParam); + + /** + * 根据id集合获取组织集合 + * + * @author xuyuxiang + * @date 2023/6/25 11:03 + **/ + List getOrgListByIdList(SysUserIdListParam sysUserIdListParam); + + /** + * 根据id集合获取用户集合 + * + * @author xuyuxiang + * @date 2023/6/25 11:03 + **/ + List getUserListByIdList(SysUserIdListParam sysUserIdListParam); + + /** + * 根据id集合获取职位集合 + * + * @author xuyuxiang + * @date 2023/6/25 11:03 + **/ + List getPositionListByIdList(SysUserIdListParam sysUserIdListParam); + + /** + * 根据id集合获取角色集合 + * + * @author xuyuxiang + * @date 2023/6/25 11:03 + **/ + List getRoleListByIdList(SysUserIdListParam sysUserIdListParam); } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index 9f8db274..04e0cfcf 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -1423,21 +1423,10 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public List getCachedAllUserSelectorList() { - // 从缓存中取 - Object cacheValue = commonCacheOperator.get(USER_CACHE_ALL_KEY); - if(ObjectUtil.isNotEmpty(cacheValue)) { - return JSONUtil.toList(JSONUtil.parseArray(cacheValue), SysUser.class); - } - // 只查询部分字段 - List userList = this.list(new LambdaQueryWrapper().select(SysUser::getId, SysUser::getOrgId, - SysUser::getId, SysUser::getPositionId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode) - .orderByAsc(SysUser::getSortCode)); - if(ObjectUtil.isNotEmpty(userList)) { - // 更新到缓存 - commonCacheOperator.put(USER_CACHE_ALL_KEY, userList); - } - return userList; + public Page getAllUserSelectorList() { + return this.page(CommonPageRequest.defaultPage(), new LambdaQueryWrapper().select(SysUser::getId, + SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount, SysUser::getName, + SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate).orderByAsc(SysUser::getSortCode)); } /* ====用户部分所需要用到的选择器==== */ @@ -1452,7 +1441,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public List orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam) { + public Page orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 查询部分字段 lambdaQueryWrapper.select(SysOrg::getId, SysOrg::getParentId, SysOrg::getName, @@ -1464,11 +1453,11 @@ public class SysUserServiceImpl extends ServiceImpl impl lambdaQueryWrapper.like(SysOrg::getName, sysUserSelectorOrgListParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(SysOrg::getSortCode); - return sysOrgService.list(lambdaQueryWrapper); + return sysOrgService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } @Override - public List positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam) { + public Page positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 查询部分字段 lambdaQueryWrapper.select(SysPosition::getId, SysPosition::getOrgId, SysPosition::getName, @@ -1480,11 +1469,11 @@ public class SysUserServiceImpl extends ServiceImpl impl lambdaQueryWrapper.like(SysPosition::getName, sysUserSelectorPositionParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(SysPosition::getSortCode); - return sysPositionService.list(lambdaQueryWrapper); + return sysPositionService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } @Override - public List roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam) { + public Page roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.select(SysRole::getId, SysRole::getOrgId, SysRole::getName, SysRole::getCategory, SysRole::getSortCode); @@ -1498,33 +1487,34 @@ public class SysUserServiceImpl extends ServiceImpl impl lambdaQueryWrapper.like(SysRole::getName, sysUserSelectorRoleParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(SysRole::getSortCode); - return sysRoleService.list(lambdaQueryWrapper); + return sysRoleService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } @Override - public List userSelector(SysUserSelectorUserParam sysUserSelectorUserParam) { + public Page userSelector(SysUserSelectorUserParam sysUserSelectorUserParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); // 只查询部分字段 - lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode); - // 如果查询条件为空,则从缓存中查询 + lambdaQueryWrapper.select(SysUser::getId, SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount, + SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate); + // 如果查询条件为空,则直接查询 if(ObjectUtil.isAllEmpty(sysUserSelectorUserParam.getOrgId(), sysUserSelectorUserParam.getSearchKey())) { return this.getCachedAllUserSelectorList(); } else { if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getOrgId())) { - // 如果机构id不为空,则查询该机构所在顶级机构下的所有人 - List parentAndChildOrgIdList = CollStreamUtil.toList(sysOrgService.getParentAndChildListById(sysOrgService + // 如果机构id不为空,则查询该机构所在顶级机构下的所有人 + List parentAndChildOrgIdList = CollStreamUtil.toList(sysOrgService.getParentAndChildListById(sysOrgService .getCachedAllOrgList(), sysUserSelectorUserParam.getOrgId(), true), SysOrg::getId); if (ObjectUtil.isNotEmpty(parentAndChildOrgIdList)) { lambdaQueryWrapper.in(SysUser::getOrgId, parentAndChildOrgIdList); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } } if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getSearchKey())) { lambdaQueryWrapper.like(SysUser::getName, sysUserSelectorUserParam.getSearchKey()); } lambdaQueryWrapper.orderByAsc(SysUser::getSortCode); - return this.list(lambdaQueryWrapper); + return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper); } } @@ -1540,4 +1530,42 @@ public class SysUserServiceImpl extends ServiceImpl impl public SysUserMessageDetailResult loginMessageDetail(SysUserMessageIdParam sysUserMessageIdParam) { return JSONUtil.toBean(devMessageApi.detail(sysUserMessageIdParam.getId()), SysUserMessageDetailResult.class); } + + @Override + public List getOrgListByIdList(SysUserIdListParam sysUserIdListParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + // 查询部分字段 + lambdaQueryWrapper.select(SysOrg::getId, SysOrg::getParentId, SysOrg::getName, SysOrg::getCategory, SysOrg::getSortCode) + .in(SysOrg::getId, sysUserIdListParam.getIdList()).orderByAsc(SysOrg::getSortCode); + return sysOrgService.list(lambdaQueryWrapper); + } + + @Override + public List getUserListByIdList(SysUserIdListParam sysUserIdListParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + // 只查询部分字段 + lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode) + .in(SysUser::getId, sysUserIdListParam.getIdList()).orderByAsc(SysUser::getSortCode); + return this.list(lambdaQueryWrapper); + } + + @Override + public List getPositionListByIdList(SysUserIdListParam sysUserIdListParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + // 查询部分字段 + lambdaQueryWrapper.select(SysPosition::getId, SysPosition::getOrgId, SysPosition::getName, + SysPosition::getCategory, SysPosition::getSortCode) + .in(SysPosition::getId, sysUserIdListParam.getIdList()).orderByAsc(SysPosition::getSortCode); + return sysPositionService.list(lambdaQueryWrapper); + } + + @Override + public List getRoleListByIdList(SysUserIdListParam sysUserIdListParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + // 查询部分字段 + lambdaQueryWrapper.select(SysRole::getId, SysRole::getOrgId, SysRole::getName, + SysRole::getCategory, SysRole::getSortCode) + .in(SysRole::getId, sysUserIdListParam.getIdList()).orderByAsc(SysRole::getSortCode); + return sysRoleService.list(lambdaQueryWrapper); + } }