From 9863937b2e865710d1d51c792aefb025a2190c7d Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Fri, 25 Aug 2023 09:15:00 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8825=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=BC=E5=87=BA=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KcExportConfigTpkwcqkjzglxController.java        |  4 ++--
 .../org/jeecg/modules/kc/config/export/Export.java   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
index 442a877c..b8dd5b25 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
@@ -319,7 +319,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 	 @RequestMapping(value = "/exportWord")
 	 public void exportWord(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx, String xqxnParam, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		Export export = new Export();
-		WordOperator wo = export.export(kcExportConfigTpkwcqkjzglx, xqxnParam);
+		WordOperator wo = export.export(kcExportConfigTpkwcqkjzglx, kcExportConfigTpkwcqkjzglx.getXqxn());
 		ExportWord.download_word(request, response, "file.doc", wo);
 	 }
 
@@ -334,7 +334,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 	 @RequestMapping(value = "/exportPdf")
 	 public void exportPdf(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx, String xqxnParam, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		 Export export = new Export();
-		 WordOperator wo = export.export(kcExportConfigTpkwcqkjzglx, xqxnParam);
+		 WordOperator wo = export.export(kcExportConfigTpkwcqkjzglx, kcExportConfigTpkwcqkjzglx.getXqxn());
 		 ExportWord.download_pdf(request, response, "file", wo);
 	 }
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java
index 519c1c3c..1e2e9082 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java
@@ -87,11 +87,11 @@ public class Export extends BaseExport {
 		GroupConfig config;
 		config = genConfig("oneList","学院（部）教务委员会委员","340");					putGroupConfigMap(config.getKey(),config);
 		config = genConfig("twoList","行政负责人、教学副院（部）长及系（专业）负责人","220");	putGroupConfigMap(config.getKey(),config);
-		config = genConfig("threeListSize","其他党政领导及辅导员","110");					putGroupConfigMap(config.getKey(),config);
-		config = genConfig("threeListSize","其他党政领导及辅导员","210");					putGroupConfigMap(config.getKey(),config);
-		config = genConfig("threeListSize","其他党政领导及辅导员","270");					putGroupConfigMap(config.getKey(),config);
-		config = genConfig("threeListSize","其他党政领导及辅导员","280");					putGroupConfigMap(config.getKey(),config);
-		config = genConfig("fourListSize","其他专任教师","1");							putGroupConfigMap(config.getKey(),config);
+		config = genConfig("threeList","其他党政领导及辅导员","110");						putGroupConfigMap(config.getKey(),config);
+		config = genConfig("threeList","其他党政领导及辅导员","210");						putGroupConfigMap(config.getKey(),config);
+		config = genConfig("threeList","其他党政领导及辅导员","270");						putGroupConfigMap(config.getKey(),config);
+		config = genConfig("threeList","其他党政领导及辅导员","280");						putGroupConfigMap(config.getKey(),config);
+		config = genConfig("fourList","其他专任教师","1");								putGroupConfigMap(config.getKey(),config);
 	}
 //	/**
 //	 *
@@ -250,7 +250,7 @@ public class Export extends BaseExport {
 		//********************************表头END**********************************************************/
 		wo.replaceTextPlus(result);
 		//********************************@A.单个内容替换END**************************************************/
-		final int[] index = {4};
+		final int[] index = { 4 };
 		List<List<String>> mainList = Lists.newArrayList();