buzhanyi 1 год назад
Родитель
Сommit
27e5dffbfa

+ 3 - 1
purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -4810,6 +4810,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         //(6)流废标率,出现流废标情况的项目/审核下达采购机构实施的采购项目
         //项目状态存在过“流废标处置”的项目数/项目状态为“任务已下达”以后的状态的所有项目*100%
         //本年度的项目
+        pmDemandReqVo.setDeptList(null);
+        pmDemandReqVo.setDemandIdAll(null);
         if (pmDemandReqVo.getPurchaseDeptId().equals(-1)) {
             pmDemandReqVo.setDeptList(demandIdAll);
         } else {
@@ -4822,7 +4824,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         if (ObjectUtils.isEmpty(pmDemandReqVo.getDeptList()) && ObjectUtils.isEmpty(pmDemandReqVo.getDemandIdAll())) {
             lfbl = "0.00%";
         } else {
-            if (pmDemandReqVo.getDemandIdAll().size() > 0) {
+            if (!ObjectUtils.isEmpty(pmDemandReqVo.getDemandIdAll())) {
                 dmLp.in(PmDemand::getDemandId, queryZD);
             } else {
                 dmLp.in(PmDemand::getPurchaseDeptId, demandIdAll);