From 8462d290210f710cf40e4ed148e93d0245033791 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 11 Jan 2024 09:57:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=9D=83=E9=99=90=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=EF=BC=9B79588?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessEsPermissionApplyController.java | 10 ++++----- .../IProcessEsPermissionApplyService.java | 4 ++-- .../ProcessEsPermissionApplyServiceImpl.java | 21 ++++++++++++------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java index 123bddcb..5932d35c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java @@ -7,8 +7,8 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -69,10 +69,10 @@ public class ProcessEsPermissionApplyController extends JeroController> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - IPage pageList = processEsPermissionApplyService.queryEnterpriseByPage(manyStandardSelectionBoxVO, pageNo, pageSize); + public Result> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + IPage pageList = processEsPermissionApplyService.queryEnterpriseByPage(manyStandardSelectionBoxVO, pageNo, pageSize); return Result.OK(pageList); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java index 4ef46bd6..08fd0c92 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -92,5 +92,5 @@ public interface IProcessEsPermissionApplyService extends IService queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize); + IPage queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java index 8544a4c8..3e27afdc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java @@ -12,6 +12,7 @@ import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermi import com.jero.modules.activiti.process.espermissionapply.mapper.ProcessEsPermissionApplyMapper; import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; @@ -169,7 +170,7 @@ public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize) { + public IPage queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(manyStandardSelectionBoxVO.getStandardNumberOrName())){ queryWrapper.and(qw -> @@ -177,20 +178,26 @@ public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl list = lawsEnterpriseStandardService.list(queryWrapper); - List lawsEnterpriseStandardList = new ArrayList<>(); + List result = new ArrayList<>(); + // 权限校验 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); for (LawsEnterpriseStandard lawsEnterpriseStandard : list) { boolean b = enterpriseStandardAuthUserService.hasESAuth(loginUser.getId(), Collections.singletonList(lawsEnterpriseStandard.getId())); - if (b){ - lawsEnterpriseStandardList.add(lawsEnterpriseStandard); + if (!b){ + ManyStandardSelectionBox manyStandardSelectionBox = new ManyStandardSelectionBox(); + BeanUtils.copyProperties(lawsEnterpriseStandard, manyStandardSelectionBox); + result.add(manyStandardSelectionBox); } } - IPage page = new Page(pageNo ,pageSize); - page.setTotal(lawsEnterpriseStandardList.size()); + + // 手动分页 + IPage page = new Page<>(pageNo ,pageSize); + page.setTotal(result.size()); page.setRecords( - lawsEnterpriseStandardList.stream() + result.stream() .skip((long) (Math.max(1, pageNo) - 1) * pageSize) .limit(pageSize) .collect(Collectors.toList()));