历史

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandHisServiceImpl.java

@@ -517,8 +517,10 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
 
                 //project_type,evaluation 从原来计划里取
                 ProvisionalPlan provisionalPlan = provisionalPlanMapper.seletById(pmDemandHis.getPlanId());
-                vo.setProjectType(provisionalPlan.getProjectType());
-                vo.setEvaluation(provisionalPlan.getEvaluation().doubleValue());
+                if(provisionalPlan !=null){
+                    vo.setProjectType(provisionalPlan.getProjectType());
+                    vo.setEvaluation(provisionalPlan.getEvaluation().doubleValue());
+                }
 
                 SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(vo.getPurchaseDeptId()).get("sysDept");
                 if (sysDeptResponseVo != null) {

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

@@ -233,8 +233,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                 //project_type,evaluation 从原来计划里取
                 ProvisionalPlan provisionalPlan = provisionalPlanMapper.seletById(pmDemand.getPlanId());
-                vo.setProjectType(provisionalPlan.getProjectType());
-                vo.setEvaluation(provisionalPlan.getEvaluation().doubleValue());
+                if(provisionalPlan !=null) {
+                    vo.setProjectType(provisionalPlan.getProjectType());
+                    vo.setEvaluation(provisionalPlan.getEvaluation().doubleValue());
+                }
 
                 SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(vo.getPurchaseDeptId()).get("sysDept");
                 if (sysDeptResponseVo != null) {