|
@@ -638,7 +638,9 @@ public class WmPackageManager {
|
|
|
// 计划名称
|
|
|
Integer planId = pkg2PlanMap.get(Integer.parseInt(pkg.getId()));
|
|
|
SysImplementPlan plan = planMap.get(planId);
|
|
|
- model.setPlanName(plan.getPlanName());
|
|
|
+ model.setPlanName(
|
|
|
+ plan != null ? plan.getPlanName() : ""
|
|
|
+ );
|
|
|
|
|
|
// 产品&生产企业
|
|
|
WmDaDrugEntDrugtable drugtable = drugtableMap.get(pkg.getDrugtable()[0]);
|
|
@@ -649,7 +651,7 @@ public class WmPackageManager {
|
|
|
|
|
|
// 承接对象
|
|
|
SysDept s = service.get(Integer.parseInt(pkg.getDeptId()));
|
|
|
- model.setServiceName(s.getName());
|
|
|
+ model.setServiceName(s != null ? s.getName() : "");
|
|
|
|
|
|
List<String> cPkgIdList = parentId2PkgMap.get(pkg.getId());
|
|
|
|