diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index cb165d4..59f87c8 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -2871,6 +2871,24 @@ public class HuzhouProjectinfoServiceImpl 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 -> ids.contains(project.getId())) + .collect(Collectors.toList()); for (HuzhouProjectinfo projectInfo : projectInfoList) { String projectId = projectInfo.getId(); // 1.获取当且任务所处的节点名称 @@ -2920,7 +2938,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl超时支付次数为:{}", projectInfo.getProjectName(),projectInfo.getUpdateCount()); - //TODO 7.评分 + // 7.评分 fillScore(projectInfo); String timeOutPaySituation = tmp.getTimeOutPaySituation(); if (containsTimeoutGreaterThanDays(timeOutPaySituation, 7)) {