提交

src/main/java/cn/ezhizao/project/business/controller/BizCertificateController.java

@@ -361,14 +361,16 @@ public class BizCertificateController extends BaseController
         certificate.setTenantId(getLoginUser().getTenantId());
         certificate.setPrintDate(new Date());
         certificate.setFactoryName("德迈仕");
-        BizPackageResourceGroup bizPackageResourceGroup = bizPackageResourceGroupService.getById(bizDaywork.getPackageResourceGroupId());
-        SysDept dept = sysDeptService.selectDeptById(bizPackageResourceGroup.getDeptId());
-        certificate.setDeptName(dept.getDeptName());
-        certificate.setDeptId(bizPackageResourceGroup.getDeptId());
-        certificate.setPackageLineNo(bizPackageResourceGroup.getPackageLineNo().toString());
-        certificate.setPackageResourceGroupId(bizPackageResourceGroup.getId());
-        certificate.setPackageResourceGroupName(bizPackageResourceGroup.getName());
-        certificate.setYear(bizPackageResourceGroup.getYear());
+        if (bizDaywork.getPackageResourceGroupId() != null && !bizDaywork.getPackageResourceGroupId().equals(0L)) {
+            BizPackageResourceGroup bizPackageResourceGroup = bizPackageResourceGroupService.getById(bizDaywork.getPackageResourceGroupId());
+            SysDept dept = sysDeptService.selectDeptById(bizPackageResourceGroup.getDeptId());
+            certificate.setDeptName(dept.getDeptName());
+            certificate.setDeptId(bizPackageResourceGroup.getDeptId());
+            certificate.setPackageLineNo(bizPackageResourceGroup.getPackageLineNo().toString());
+            certificate.setPackageResourceGroupId(bizPackageResourceGroup.getId());
+            certificate.setPackageResourceGroupName(bizPackageResourceGroup.getName());
+            certificate.setYear(bizPackageResourceGroup.getYear());
+        }
         BizCompanyProductPackage packageConditions = new BizCompanyProductPackage();
         packageConditions.setProductId(certificate.getProductId());
         packageConditions.setCompanyId(certificate.getCompanyId());