From 436f3f950ecf583f2b2098241a1540bca9319c35 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 18 Jul 2022 15:57:46 +0800
Subject: [PATCH] update

---
 .../service/impl/LawsComplianceBoardServiceImpl.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java
index 1a9c4150c..b0a3c53e1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java
@@ -157,7 +157,7 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
                     String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("designStatus").toString(), cut);
                     complianceResult.put("designStatus_dicText",textByValue);
                 }
-                if (complianceResult.get("prehomoStatus") != null) {
+                if (complianceResult.get("prehomoStatus") != null && complianceResult.get("prehomoStatus") != "") {
                     String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("prehomoStatus").toString(), cut);
                     complianceResult.put("prehomoStatus_dicText",textByValue);
                 }
@@ -192,6 +192,13 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
                     }
                     complianceResult.put("dutyTerritory_dicText",dutyTerritory_dicText);
                 }
+
+                Map<String,Object> dataMap = (Map<String, Object>) complianceResult;
+                dataMap.entrySet().forEach(map -> {
+                    if(map.getValue() == null){
+                        map.setValue("");
+                    }
+                });
             }
         }
     }