From 73ec80b490ce81bcbb1b3d0a6bc2685be0f22e91 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 18 Dec 2023 14:52:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9):=2079376?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/process/aspect/ProcessAspect.java |  1 -
 ...rpriseStandardInspectReportServiceImpl.java | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java
index a2c35912..ed6124da 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java
@@ -127,7 +127,6 @@ public class ProcessAspect {
                                 .ne(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
                                 .set(ProcessApprovalRecord::getCommitFlag, CommitFlagEnum.UNDISPOSED.getValue())
                                 .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.SUSPEND.getValue()));
-
             }
         }
         log.info("==========流程会签节点驳回一票否决前置方法结束==========");
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java
index 65572025..92e4a320 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java
@@ -23,6 +23,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
 * @author ThinkBook
@@ -161,8 +162,10 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
         EnterpriseStandardInspectReport enterpriseStandardInspectReport = getById(id);
         // 稽查内容查询
         EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
-        enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo());
-        enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+        if (!Objects.isNull(enterpriseStandardInspectContent)){
+            enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
+            enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+        }
         return enterpriseStandardInspectReport;
     }
 
@@ -173,8 +176,10 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
                 .orderByDesc(EnterpriseStandardInspectReport::getCreateTime));
         // 稽查内容查询
         EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
-        enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo());
-        enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+        if (!Objects.isNull(enterpriseStandardInspectContent)){
+            enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
+            enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+        }
         return enterpriseStandardInspectReport;
     }
 
@@ -187,7 +192,10 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
         for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : list) {
             // 稽查内容查询
             EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
-            enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo());
+            if (Objects.isNull(enterpriseStandardInspectContent)){
+                continue;
+            }
+            enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
             enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
         }
         return list;