From 5701e0e59f8682301d378d90a96edc169e8985aa Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 27 Oct 2022 15:06:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9--=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E8=BE=B9=E8=B7=9D,=20=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E9=A2=84=E7=95=99=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java     | 4 ++--
 .../src/main/java/com/jero/modules/report/util/WordUtil.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
index cd0701450..877e7d373 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
@@ -832,7 +832,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 				}
 				if(StringUtils.isNotBlank(twoTitle)){
 					WordUtil.exportWord(document, twoNumber+" "+twoTitle, null, ParagraphAlignment.LEFT,
-							2, 11, false, true, "Blue Sky Noto Regular","1","二级标题",null);
+							6, 11, false, true, "Blue Sky Noto Regular","1","二级标题",null);
 					twoCount++;
 				}
 
@@ -846,7 +846,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 					}
 					if(org.apache.commons.lang3.StringUtils.isNotBlank(reportTitle)){
 						WordUtil.exportWord(document, reportCount+". "+reportTitle, null, ParagraphAlignment.LEFT,
-								4, 11, false, false, "Blue Sky Noto Regular","2","三级标题",null);
+								12, 11, false, false, "Blue Sky Noto Regular","2","三级标题",null);
 						reportCount++;
 					}
 				}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
index f74979de8..2b9986eca 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
@@ -420,8 +420,8 @@ public class WordUtil {
         pgSz.setH(BigInteger.valueOf(16838));
         CTPageMar pageMar = sectPr.getPgMar();
         if (pageMar == null) pageMar = sectPr.addNewPgMar();
-        pageMar.setLeft(BigInteger.valueOf(1797)); //左边距
-        pageMar.setRight(BigInteger.valueOf(1797));//右边距
+        pageMar.setLeft(BigInteger.valueOf(1083)); //左边距
+        pageMar.setRight(BigInteger.valueOf(1083));//右边距
         pageMar.setTop(BigInteger.valueOf(1440)); //页眉高度
         pageMar.setBottom(BigInteger.valueOf(1440));//页脚高度