DeBugDeBugDeBug

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -1125,6 +1125,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return Math.toIntExact(aLong);
     }
 
+    /**
+     * 首页待办事项---计划待提交or待审核
+     *
+     * @param projectStatus
+     * @return
+     */
     public List<PlanQuarterResponseVo> getListByProjectStatus(String projectStatus) {
         LoginUser user = SecurityUtils.getLoginUser();
         LambdaQueryWrapper<PlanYears> yearsLp = new LambdaQueryWrapper<PlanYears>();
@@ -1166,12 +1172,28 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         yearsLp.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         yearsLp.eq(PlanYears::getProjectStatus, projectStatus);
         yearsLp.eq(PlanYears::getPurchaseDeptId, user.getDeptId());
+        List<PmAuditDeptRef> list = new ArrayList<>();
+        LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
+        l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
+        l.eq(PmAuditDeptRef::getRefType, "0");
+        list = pmAuditDeptRefService.list(l);
+        if (!ObjectUtils.isEmpty(list) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
+            yearsLp.in(PlanYears::getPlanYearId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+        }
         Long count = planYearsMapper.selectCount(yearsLp);
 
         LambdaQueryWrapper<PlanQuarter> quarterLp = new LambdaQueryWrapper<PlanQuarter>();
         quarterLp.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         quarterLp.eq(PlanQuarter::getProjectStatus, projectStatus);
         quarterLp.eq(PlanQuarter::getPurchaseDeptId, user.getDeptId());
+        List<PmAuditDeptRef> listF = new ArrayList<>();
+        LambdaQueryWrapper<PmAuditDeptRef> lq = new LambdaQueryWrapper<>();
+        lq.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
+        lq.eq(PmAuditDeptRef::getRefType, "1");
+        listF = pmAuditDeptRefService.list(lq);
+        if (!ObjectUtils.isEmpty(listF) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
+            yearsLp.in(PlanYears::getPlanYearId, listF.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+        }
         Long aLong = planQuarterMapper.selectCount(quarterLp);
         //融合一起
         return Math.toIntExact(count) + Math.toIntExact(aLong);