From cad6f3f7df2ea06f9ffd55847a62db6aa1ca3ba1 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 2 Jan 2024 13:40:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B):79375?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...priseStandardInspectReportServiceImpl.java | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

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 92e4a320..ef175382 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
@@ -3,6 +3,7 @@ package com.jero.modules.laws.enterprise.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.LanguageEnum;
@@ -163,8 +164,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
         // 稽查内容查询
         EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
         if (!Objects.isNull(enterpriseStandardInspectContent)){
-            enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
-            enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+            if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getClause())){
+                enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
+            }
+            if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getRequirement())){
+                enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+            }
         }
         return enterpriseStandardInspectReport;
     }
@@ -177,8 +182,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
         // 稽查内容查询
         EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
         if (!Objects.isNull(enterpriseStandardInspectContent)){
-            enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
-            enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+            if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getClause())){
+                enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
+            }
+            if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getRequirement())){
+                enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+            }
         }
         return enterpriseStandardInspectReport;
     }
@@ -195,8 +204,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
             if (Objects.isNull(enterpriseStandardInspectContent)){
                 continue;
             }
-            enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
-            enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+            if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getClause())){
+                enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
+            }
+            if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getRequirement())){
+                enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
+            }
         }
         return list;
     }