luoyb
2022-03-13 d014a10a4e597718375c0964f0394babb3eae7d7
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
@@ -55,8 +55,9 @@
    @Override
    public IPage<SystemUser> findUserDetailList(SystemUser user, QueryRequest request) {
        Page<SystemUser> page = new Page<>(request.getPageNum(), request.getPageSize());
        String currentUserId= FebsUtil.getUserId();
        SortUtil.handlePageSort(request, page, "userId", FebsConstant.ORDER_ASC, false);
        return this.baseMapper.findUserDetailPage(page, user);
        return this.baseMapper.findUserDetailPage(page, user, currentUserId);
    }
    @Override
@@ -92,10 +93,14 @@
        save(user);
        // 保存用户角色
        String[] roles = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getRoleId(), StringConstant.COMMA);
        setUserRoles(user, roles);
        // 保存用户数据权限关联关系
        if(roles!=null){
            setUserRoles(user, roles);
        }
        String[] deptIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getDeptIds(), StringConstant.COMMA);
        setUserDataPermissions(user, deptIds);
        if(deptIds!=null){
            // 保存用户数据权限关联关系
            setUserDataPermissions(user, deptIds);
        }
    }
    @Override