统计

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

@@ -790,7 +790,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     sysDept = deptService.selectById(Long.valueOf(organDivision));
                     if (!ObjectUtils.isEmpty(sysDept)) {
                         planQuarter.setOrganDivisionStr(sysDept.getDeptName());
-                        break;
                     }
                 }
             }

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

@@ -1217,7 +1217,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     sysDept = deptService.selectById(Long.valueOf(organDivision));
                     if (!ObjectUtils.isEmpty(sysDept)) {
                         planYear.setOrganDivisionStr(sysDept.getDeptName());
-                        break;
                     }
                 }
             }
@@ -1228,7 +1227,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 PmDemand demand = demandService.selectByPlanId(byPlanYearId.getPlanPracticalId());
                 if (!ObjectUtils.isEmpty(demand) && !demand.getProjectStatus().equals(PmProjectStatus.DEMAND_WAIT_FILL.getCode())) {
                     planYear.setAppDeleteDo("false");
-                } else if (planYear.getAppDelete().equals("true")) {
+                } else if (!ObjectUtils.isEmpty(planYear.getAppDelete()) && planYear.getAppDelete().equals("true")) {
                     //申请过的不能再申请
                     planYear.setAppDeleteDo("false");
                 } else {