Browse Source

add null checks

dengjia 4 months ago
parent
commit
9c71332741

+ 4 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

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