用户列表支持多部门

aix

2024-07-12 277155c0d41b8131dd8c0694b578947dc64745ba

用户列表支持多部门

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java

@@ -157,8 +157,8 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "列表", notes = "传入account和realName")
//    @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
    public R<IPage<UserVO>> page(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
        IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
    public R<IPage<UserVO>> page(@ApiIgnore UserVO user, Query query, String deptIds, BladeUser bladeUser) {
        IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptIds, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
        return R.data(UserVOWrapper.build().pageVO(pages));
    }


 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java

@@ -70,7 +70,7 @@
     * @param tenantId
     * @return
     */
    IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
    IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, String deptIds, String tenantId);

    List<UserVO> getAllUser(UserVO user, Long deptId, String tenantId);


 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java

@@ -208,17 +208,22 @@
     * 自定义分页查询
     * @param page
     * @param user
     * @param deptId
     * @param deptIds
     * @param tenantId
     * @return
     */
    @Override
    public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
    public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, String deptIds, String tenantId) {
        List<Long> deptIdList = new ArrayList<>();
        String [] deptidsStr = deptIds.split(",");
        if (null!=user.getIsDept()) {
            deptIdList.add(deptId);
            for (String str:deptidsStr) {
                deptIdList.add(Long.parseLong(str));
            }
        }else {
            deptIdList = SysCache.getDeptChildIds(deptId);
            for (String str:deptidsStr) {
                deptIdList.addAll(SysCache.getDeptChildIds(Long.parseLong(str)));
            }
        }
        return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
    }