From 8b884106b476eb395e501dc554b387cf57768260 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 26 Sep 2023 10:06:02 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/split/service/impl/FileSpiltService.java    | 5 +++--
 .../split/service/impl/SarFileSplitInfoServiceImpl.java      | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
index d87500f5..e8f72455 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
@@ -181,16 +181,17 @@ public class FileSpiltService {
                     for (XWPFRun xwrun : p.getRuns()) {
                         VerticalAlign subscript = xwrun.getSubscript();
                         String smalltext = xwrun.getText(0);
+                        if (smalltext==null){
+                            continue;
+                        }
                         switch (subscript) {
                             case BASELINE:
                                 stringBuilder.append(smalltext);
                                 break;
                             case SUBSCRIPT:
-                                System.out.println("smalltext, subscript = " + smalltext);
                                 stringBuilder.append("<sub>").append(smalltext).append("</sub>");
                                 break;
                             case SUPERSCRIPT:
-                                System.out.println("smalltext, superscript = " + smalltext);
                                 stringBuilder.append("<sup>").append(smalltext).append("</sup>");
                                 break;
                             default:
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
index 76ca7f77..9c80715d 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
@@ -11,6 +11,7 @@ import com.jero.common.constant.enums.ModuleEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.DictModel;
+import com.jero.common.util.MessageUtils;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.document.enums.FieldTypeEnum;
@@ -104,7 +105,7 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 		result = fileSpiltService.fileCHN(sarFileSplitInfoEO,SplitFileTypeTypeEnum.GBT);
 
 		if(result == -1){
-			if(LanguageEnum.CN.getValue().equals(sarFileSplitInfoEO.getCut())) {
+			if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) {
 				throw new JeroBootException("文档格式错误，请检查文档内容！");
 			}else{
 				throw new JeroBootException("The document format is wrong. Please check the document content!");