diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java index 9134bde..3ee9224 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java @@ -400,9 +400,11 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl planList = this.getPlanContractinfoByprojectId(projectId); - + for (HuzhouContractinfo huzhouContractinfo : planList) { + log.info("计划合同信息:"+huzhouContractinfo.getTaskName()); + } planList= planList.stream() - .filter(item -> item.getTaskName().equals(taskName)) + .filter(item -> item.getTaskName() != null && item.getTaskName().equals(taskName)) .collect(Collectors.toList()); contractInfoVo.setHasInfo(true); contractInfoVo.setPlanList(planList); @@ -514,6 +516,7 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl sortedPlanContracts = planContractInfoList.stream() + .filter(item -> item.getTaskName() != null) .filter(contract -> contract.getTaskName().equals(taskNameFromContract)) .sorted(Comparator.comparing(HuzhouContractinfo::getPayDate)) .collect(Collectors.toList()); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index becbb14..6d1270b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -211,9 +211,11 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl projectInfoList = this.list(); + // 根据用户角色权限过滤项目 + Page page = new Page(1, projectInfoList.size()); + HuzhouProjectinfo projectinfo = new HuzhouProjectinfo(); + projectinfo.setStage("4"); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); + + Page projectAndChildInfoPageList; + projectAndChildInfoPageList = projectinfoMapper.getProjectAndChildInfoPageList(page, projectInfoAuthSelect); + List records = projectAndChildInfoPageList.getRecords(); + List ids = records.stream() + .map(HuzhouProjectinfoOV::getId) + .collect(Collectors.toList()); + + projectInfoList= projectInfoList.stream() .filter(project -> !"-1".equals(project.getStage())) + .filter(project -> !"湖州市长兴县浙里健康e生省级试点应用建设项目".equals(project.getProjectName())) + .filter(project -> ids.contains(project.getId())) .collect(Collectors.toList()); @@ -2888,6 +2904,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl !"-1".equals(project.getStage())) .filter(project -> ids.contains(project.getId())) + .filter(project -> !"湖州市长兴县浙里健康e生省级试点应用建设项目".equals(project.getProjectName())) .collect(Collectors.toList()); for (HuzhouProjectinfo projectInfo : projectInfoList) { String projectId = projectInfo.getId(); @@ -3047,7 +3064,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl