提交 27375104 authored 作者: 吕本才's avatar 吕本才

1、修改分页问题和权限问题

上级 ae9589c9
...@@ -33,7 +33,8 @@ public class JimuReportAuthQueryController extends BaseController { ...@@ -33,7 +33,8 @@ public class JimuReportAuthQueryController extends BaseController {
*/ */
@GetMapping("/list/user") @GetMapping("/list/user")
@RequiresPermissions(value = {"report:auth:userlist"}) @RequiresPermissions(value = {"report:auth:userlist"})
public R<List<SysUser>> selectUserList(String reportId) { public R<List<SysUser>> selectUserList(String reportId ) {
PageInfo<SysUser> userPageInfo = authQueryService.selectUserList(reportId); PageInfo<SysUser> userPageInfo = authQueryService.selectUserList(reportId);
return R.ok(userPageInfo.getRows()); return R.ok(userPageInfo.getRows());
} }
......
...@@ -5,7 +5,6 @@ import com.link.report.pojo.response.JimuReportCategoryDto; ...@@ -5,7 +5,6 @@ import com.link.report.pojo.response.JimuReportCategoryDto;
import com.link.report.service.query.JimuReportCategoryQueryService; import com.link.report.service.query.JimuReportCategoryQueryService;
import com.sfa.common.core.domain.R; import com.sfa.common.core.domain.R;
import com.sfa.common.core.web.controller.BaseController; import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.security.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -33,7 +32,7 @@ public class JimuReportCategoryQueryController extends BaseController { ...@@ -33,7 +32,7 @@ public class JimuReportCategoryQueryController extends BaseController {
* @return * @return
*/ */
@GetMapping("/list") @GetMapping("/list")
@RequiresPermissions(value = {"report:jimuReport:list"}) // @RequiresPermissions(value = {"report:jimuReport:list"})
public R<List<JimuReportCategoryDto>> selectList(JimuReportCategoryVo categoryVo) { public R<List<JimuReportCategoryDto>> selectList(JimuReportCategoryVo categoryVo) {
List<JimuReportCategoryDto> categoryDtos = categoryQueryService.selectList(categoryVo); List<JimuReportCategoryDto> categoryDtos = categoryQueryService.selectList(categoryVo);
return R.ok(categoryDtos); return R.ok(categoryDtos);
......
...@@ -3,14 +3,12 @@ package com.link.report.domain.dao.impl; ...@@ -3,14 +3,12 @@ package com.link.report.domain.dao.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.link.report.domain.dao.JimuReportAuthDao; import com.link.report.domain.dao.JimuReportAuthDao;
import com.link.report.domain.entity.JimuReportAuth; import com.link.report.domain.entity.JimuReportAuth;
import com.link.report.domain.mapper.JimuReportAuthMapper; import com.link.report.domain.mapper.JimuReportAuthMapper;
import com.link.report.domain.wq.JimuReportAuthListWq; import com.link.report.domain.wq.JimuReportAuthListWq;
import com.link.report.pojo.response.JimuReportAuthListDto; import com.link.report.pojo.response.JimuReportAuthListDto;
import com.sfa.common.core.utils.bean.BeanUtils; import com.sfa.common.core.utils.bean.BeanUtils;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.common.security.utils.SecurityUtils; import com.sfa.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -41,9 +39,8 @@ public class JimuReportAuthDaoImpl implements JimuReportAuthDao { ...@@ -41,9 +39,8 @@ public class JimuReportAuthDaoImpl implements JimuReportAuthDao {
// 查询数据 // 查询数据
Wrapper<JimuReportAuth> qw = new LambdaQueryWrapper<JimuReportAuth>() Wrapper<JimuReportAuth> qw = new LambdaQueryWrapper<JimuReportAuth>()
.eq(ObjectUtil.isNotEmpty(wq.getReportId()), JimuReportAuth::getReportId, wq.getReportId()); .eq(ObjectUtil.isNotEmpty(wq.getReportId()), JimuReportAuth::getReportId, wq.getReportId());
IPage authPage = jimuReportAuthMapper.selectPage(TableSupport.pageI(), qw); List<JimuReportAuth> authPage = jimuReportAuthMapper.selectList(qw);
List<JimuReportAuth> jimuReportAuths = authPage.getRecords(); List<JimuReportAuthListDto> dtos = BeanUtils.transitionDtos(authPage, JimuReportAuthListDto.class);
List<JimuReportAuthListDto> dtos = BeanUtils.transitionDtos(jimuReportAuths, JimuReportAuthListDto.class);
return dtos; return dtos;
} }
......
...@@ -43,6 +43,7 @@ public class JimuReportAuthQueryServiceImpl implements JimuReportAuthQueryServic ...@@ -43,6 +43,7 @@ public class JimuReportAuthQueryServiceImpl implements JimuReportAuthQueryServic
if (jimuReportListDtos != null && !jimuReportListDtos.isEmpty()) { if (jimuReportListDtos != null && !jimuReportListDtos.isEmpty()) {
// 远程调用查询用户列表分页信息 // 远程调用查询用户列表分页信息
List<Long> userIds = jimuReportListDtos.stream().map(JimuReportAuthListDto::getUserId).collect(Collectors.toList()); List<Long> userIds = jimuReportListDtos.stream().map(JimuReportAuthListDto::getUserId).collect(Collectors.toList());
Integer pageNum = Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_NUM), 1); Integer pageNum = Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_SIZE), 10000); Integer pageSize = Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_SIZE), 10000);
// 远程方法是分页方法,此处传默认分页数据 // 远程方法是分页方法,此处传默认分页数据
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论