From 81ed5cd0497213d78e2725eaa6bad974da9c2185 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Wed, 15 Nov 2023 23:44:38 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=8815=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=BC=E5=87=BA=E4=B8=B2=E8=A1=8C=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/modules/kc/jiaoshi/export/Export.java    | 4 ++--
 .../java/org/jeecg/modules/tools/word/WordOperator.java     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/export/Export.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/export/Export.java
index ffd37a1f..ffe20c24 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/export/Export.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/export/Export.java
@@ -685,13 +685,13 @@ public class Export extends BaseExport {
 				sm.append(" 异常率：");
 				//计算！
 				sm.append(getPercentageByAll(new BigDecimal(twoYcListClass.getYccs()),new BigDecimal(twoYcListClass.getJccs())));
-				sm.append("\r\n");
+				sm.append("\n");
 				i++;
 
 			}
 
 			if(nextBlockList.isEmpty()){
-				sm.append("\r\n");
+				sm.append("\n");
 			}
 
 //			String sm = "1.异常节次："+ArrayUtil.join(o.getYcHhList().toArray(new String[]{}),",")+" 异常课程："+ArrayUtil.join(o.getYcKcmcList().toArray(new String[]{}),",")+" 监测次数："+jccs+" 异常次数："+yccs+" 异常率："+ycl;
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/tools/word/WordOperator.java b/jeecg-module-main/src/main/java/org/jeecg/modules/tools/word/WordOperator.java
index 3486d20c..e337c1a6 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/tools/word/WordOperator.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/tools/word/WordOperator.java
@@ -444,7 +444,7 @@ public class WordOperator {
 						value = StringEscapeUtils.unescapeHtml4(value);
 						key = "";
 						//--2020-04修改
-						String[] values = value.split("\r\n");
+						String[] values = value.split("\n");
 						if(values.length > 1) {
 							run.setText(values[0],0);
 							for (int x = 1; x < values.length; x++) {
@@ -492,7 +492,7 @@ public class WordOperator {
 							if(style != null) style.run(run);
 							value = StringEscapeUtils.unescapeHtml4(value);
 							//--2020-04修改
-							String[] values = value.split("\r\n");
+							String[] values = value.split("\n");
 							if(values.length > 1) {
 								run.setText(textBefore + values[0],0);
 								for (int x = 1; x < values.length; x++) {
@@ -530,7 +530,7 @@ public class WordOperator {
 							if(style != null) style.run(run);
 							value = StringEscapeUtils.unescapeHtml4(value);
 							//--2020-04修改
-							String[] values = value.toString().split("\r\n");
+							String[] values = value.toString().split("\n");
 							if(values.length > 1) {
 								run.setText(values[0],0);
 								for (int x = 1; x < values.length; x++) {