DeBugDeBugDeBug

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

@@ -1152,8 +1152,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             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()));
+            if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+                if (!ObjectUtils.isEmpty(list)) {
+                    yearsLp.in(PlanYears::getPlanYearId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+                } else {
+                    yearsLp.in(PlanYears::getPlanYearId, "0");
+                }
             }
         }
         List<PlanYears> planYears = planYearsMapper.selectList(yearsLp);
@@ -1169,8 +1173,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             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()));
+            if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+                if (!ObjectUtils.isEmpty(listF)) {
+                    quarterLp.in(PlanQuarter::getPlanPracticalId, listF.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+                } else {
+                    quarterLp.in(PlanQuarter::getPlanPracticalId, "0");
+                }
             }
         }
         List<PlanQuarter> planQuarters = planQuarterMapper.selectList(quarterLp);
@@ -1193,8 +1201,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             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()));
+            if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+                if (!ObjectUtils.isEmpty(list)) {
+                    yearsLp.in(PlanYears::getPlanYearId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+                } else {
+                    yearsLp.in(PlanYears::getPlanYearId, "0");
+                }
             }
         }
         Long count = planYearsMapper.selectCount(yearsLp);
@@ -1210,8 +1222,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             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()));
+            if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+                if (!ObjectUtils.isEmpty(listF)) {
+                    quarterLp.in(PlanQuarter::getPlanPracticalId, listF.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+                } else {
+                    quarterLp.in(PlanQuarter::getPlanPracticalId, "0");
+                }
             }
         }
         Long aLong = planQuarterMapper.selectCount(quarterLp);