Explorar el Código

DeBugDeBugDeBug

buzhanyi hace 2 años
padre
commit
8e439114d1

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

@@ -1144,7 +1144,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         LambdaQueryWrapper<PlanYears> yearsLp = new LambdaQueryWrapper<PlanYears>();
         yearsLp.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         yearsLp.eq(PlanYears::getProjectStatus, projectStatus);
-        yearsLp.eq(PlanYears::getPurchaseDeptId, user.getDeptId());
         if (isAd.equals("true")) {
             List<PmAuditDeptRef> list = new ArrayList<>();
             LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
@@ -1160,6 +1159,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     yearsLp.in(PlanYears::getPlanYearId, "0");
                 }
             }
+        } else {
+            yearsLp.eq(PlanYears::getPurchaseDeptId, user.getDeptId());
         }
         List<PlanYears> planYears = planYearsMapper.selectList(yearsLp);
 
@@ -1182,6 +1183,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     quarterLp.in(PlanQuarter::getPlanPracticalId, "0");
                 }
             }
+        } else {
+            quarterLp.eq(PlanQuarter::getPurchaseDeptId, user.getDeptId());
         }
         List<PlanQuarter> planQuarters = planQuarterMapper.selectList(quarterLp);
         //融合一起
@@ -1211,6 +1214,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     yearsLp.in(PlanYears::getPlanYearId, "0");
                 }
             }
+        } else {
+            yearsLp.eq(PlanYears::getPurchaseDeptId, user.getDeptId());
         }
         Long count = planYearsMapper.selectCount(yearsLp);
 
@@ -1233,6 +1238,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     quarterLp.in(PlanQuarter::getPlanPracticalId, "0");
                 }
             }
+        } else {
+            quarterLp.eq(PlanQuarter::getPurchaseDeptId, user.getDeptId());
         }
         Long aLong = planQuarterMapper.selectCount(quarterLp);
         //融合一起