ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(权限申请流程): ；79588

Browse Source
This commit is contained in:
yjz
2024-01-11 09:57:19 +08:00
parent d4bb0c0a39
commit 8462d29021
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java
+5 -5
View File
@@ -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.entity.ProcessEsPermissionApply;
import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService;
import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; 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.common.vo.ManyStandardSelectionBoxVO;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -69,10 +69,10 @@ public class ProcessEsPermissionApplyController extends JeroController<ProcessEs
@AutoLog(value = "权限申请流程业务表-企标分页列表查询") @AutoLog(value = "权限申请流程业务表-企标分页列表查询")
@ApiOperation(value="权限申请流程业务表-企标分页列表查询", notes="权限申请流程业务表-企标分页列表查询") @ApiOperation(value="权限申请流程业务表-企标分页列表查询", notes="权限申请流程业务表-企标分页列表查询")
@GetMapping(value = "/queryEnterpriseByPage") @GetMapping(value = "/queryEnterpriseByPage")
public Result<IPage<LawsEnterpriseStandard>> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, public Result<IPage<ManyStandardSelectionBox>> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
IPage<LawsEnterpriseStandard> pageList = processEsPermissionApplyService.queryEnterpriseByPage(manyStandardSelectionBoxVO, pageNo, pageSize); IPage<ManyStandardSelectionBox> pageList = processEsPermissionApplyService.queryEnterpriseByPage(manyStandardSelectionBoxVO, pageNo, pageSize);
return Result.OK(pageList); return Result.OK(pageList);
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java
+2 -2
View File
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply;
import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; 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.common.vo.ManyStandardSelectionBoxVO;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
@@ -92,5 +92,5 @@ public interface IProcessEsPermissionApplyService extends IService<ProcessEsPerm
* @param pageSize * @param pageSize
* @return * @return
*/ */
IPage<LawsEnterpriseStandard> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize); IPage<ManyStandardSelectionBox> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize);
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java
+14 -7
View File
@@ -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.mapper.ProcessEsPermissionApplyMapper;
import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService;
import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; 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.common.vo.ManyStandardSelectionBoxVO;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
@@ -169,7 +170,7 @@ public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl<ProcessEsPe
} }
@Override @Override
public IPage<LawsEnterpriseStandard> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize) { public IPage<ManyStandardSelectionBox> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize) {
LambdaQueryWrapper<LawsEnterpriseStandard> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsEnterpriseStandard> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(manyStandardSelectionBoxVO.getStandardNumberOrName())){ if (StringUtils.isNotBlank(manyStandardSelectionBoxVO.getStandardNumberOrName())){
queryWrapper.and(qw -> queryWrapper.and(qw ->
@@ -177,20 +178,26 @@ public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl<ProcessEsPe
.or().like(LawsEnterpriseStandard::getStandardName, manyStandardSelectionBoxVO.getStandardNumberOrName())); .or().like(LawsEnterpriseStandard::getStandardName, manyStandardSelectionBoxVO.getStandardNumberOrName()));
} }
queryWrapper.orderByDesc(LawsEnterpriseStandard::getCreateTime); queryWrapper.orderByDesc(LawsEnterpriseStandard::getCreateTime);
// 查询企标数据
List<LawsEnterpriseStandard> list = lawsEnterpriseStandardService.list(queryWrapper); List<LawsEnterpriseStandard> list = lawsEnterpriseStandardService.list(queryWrapper);
List<LawsEnterpriseStandard> lawsEnterpriseStandardList = new ArrayList<>(); List<ManyStandardSelectionBox> result = new ArrayList<>();
// 权限校验 // 权限校验
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
for (LawsEnterpriseStandard lawsEnterpriseStandard : list) { for (LawsEnterpriseStandard lawsEnterpriseStandard : list) {
boolean b = enterpriseStandardAuthUserService.hasESAuth(loginUser.getId(), Collections.singletonList(lawsEnterpriseStandard.getId())); boolean b = enterpriseStandardAuthUserService.hasESAuth(loginUser.getId(), Collections.singletonList(lawsEnterpriseStandard.getId()));
if (b){ if (!b){
lawsEnterpriseStandardList.add(lawsEnterpriseStandard); ManyStandardSelectionBox manyStandardSelectionBox = new ManyStandardSelectionBox();
BeanUtils.copyProperties(lawsEnterpriseStandard, manyStandardSelectionBox);
result.add(manyStandardSelectionBox);
} }
} }
IPage<LawsEnterpriseStandard> page = new Page(pageNo ,pageSize);
page.setTotal(lawsEnterpriseStandardList.size()); // 手动分页
IPage<ManyStandardSelectionBox> page = new Page<>(pageNo ,pageSize);
page.setTotal(result.size());
page.setRecords( page.setRecords(
lawsEnterpriseStandardList.stream() result.stream()
.skip((long) (Math.max(1, pageNo) - 1) * pageSize) .skip((long) (Math.max(1, pageNo) - 1) * pageSize)
.limit(pageSize) .limit(pageSize)
.collect(Collectors.toList())); .collect(Collectors.toList()));