From 69ad8e6b701a43e1d026d1a6305d59a26cf13a3a Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 29 Sep 2022 15:36:34 +0800
Subject: [PATCH] update

---
 .../service/impl/LawsOpinionGatherEOServiceImpl.java   |  1 -
 .../service/impl/FileSplitItemsEOServiceImpl.java      | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
index 491631ca8..376cc56a3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
@@ -116,7 +116,6 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 	@Override
     public void deleteByIds(List<String> ids,String cut) {
 		QueryWrapper<LawsOpinionGatherEO> lawsOpinionGatherEOQueryWrapper = new QueryWrapper<>();
-		lawsOpinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult, GatherResultEnum.UNDERWAY.getValue());
 		lawsOpinionGatherEOQueryWrapper.lambda().in(LawsOpinionGatherEO::getId, ids);
 		List<LawsOpinionGatherEO> lawsOpinionGatherEOList = this.list(lawsOpinionGatherEOQueryWrapper);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 44ee566b3..de51fcadf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -576,10 +576,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     }
                 }
                 //如果value中包含英文单、双引号，替换成中文的。 英文的符号影响到法规技术评估流程了。
-                if(StringUtils.contains((String)entry.getValue(),"'") || StringUtils.contains((String)entry.getValue(),"\"")){
-                    String key = entry.getKey();
-                    String value = ((String) entry.getValue()).replaceAll("'", "‘").replaceAll("\"", "”");
-                    record1.put(key,value);
+                if(entry.getValue() != null){
+                    if(StringUtils.contains(entry.getValue().toString(),"'") || StringUtils.contains(entry.getValue().toString(),"\"")){
+                        String key = entry.getKey();
+                        String value = entry.getValue().toString().replaceAll("'", "‘").replaceAll("\"", "”");
+                        record1.put(key,value);
+                    }
                 }
             }
         }