DeBugDeBugDeBug

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

@@ -1145,16 +1145,16 @@ 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");
         if (isAd.equals("true")) {
+            List<PmAuditDeptRef> list = new ArrayList<>();
+            LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
+            l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
+            l.eq(PmAuditDeptRef::getRefType, "0");
             l.eq(PmAuditDeptRef::getStatus, "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()));
+            list = pmAuditDeptRefService.list(l);
+            if (!ObjectUtils.isEmpty(list) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
+                yearsLp.in(PlanYears::getPlanYearId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+            }
         }
         List<PlanYears> planYears = planYearsMapper.selectList(yearsLp);
 
@@ -1162,16 +1162,16 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         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");
         if (isAd.equals("true")) {
-            l.eq(PmAuditDeptRef::getStatus, "0");
-        }
-        listF = pmAuditDeptRefService.list(lq);
-        if (!ObjectUtils.isEmpty(listF) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
-            yearsLp.in(PlanYears::getPlanYearId, listF.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+            List<PmAuditDeptRef> listF = new ArrayList<>();
+            LambdaQueryWrapper<PmAuditDeptRef> lq = new LambdaQueryWrapper<>();
+            lq.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
+            lq.eq(PmAuditDeptRef::getRefType, "1");
+            lq.eq(PmAuditDeptRef::getStatus, "0");
+            listF = pmAuditDeptRefService.list(lq);
+            if (!ObjectUtils.isEmpty(listF) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
+                yearsLp.in(PlanYears::getPlanYearId, listF.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+            }
         }
         List<PlanQuarter> planQuarters = planQuarterMapper.selectList(quarterLp);
         //融合一起
@@ -1186,16 +1186,16 @@ 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");
         if (isAd.equals("true")) {
+            List<PmAuditDeptRef> list = new ArrayList<>();
+            LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
+            l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
+            l.eq(PmAuditDeptRef::getRefType, "0");
             l.eq(PmAuditDeptRef::getStatus, "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()));
+            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);
 
@@ -1203,16 +1203,16 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         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");
         if (isAd.equals("true")) {
-            l.eq(PmAuditDeptRef::getStatus, "0");
-        }
-        listF = pmAuditDeptRefService.list(lq);
-        if (!ObjectUtils.isEmpty(listF) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
-            yearsLp.in(PlanYears::getPlanYearId, listF.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+            List<PmAuditDeptRef> listF = new ArrayList<>();
+            LambdaQueryWrapper<PmAuditDeptRef> lq = new LambdaQueryWrapper<>();
+            lq.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
+            lq.eq(PmAuditDeptRef::getRefType, "1");
+            lq.eq(PmAuditDeptRef::getStatus, "0");
+            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);
         //融合一起