From 7448455ac0568cbc5aca6b633f6eb4d82efac668 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 07 十一月 2023 09:17:10 +0800
Subject: [PATCH] 优化系统登录的信息
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 24 ++++++++++++++++++++----
src/main/java/com/ots/project/system/user/controller/LoginController.java | 4 ++--
jar/aspose-words-21.1-jdk17.jar | 0
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/jar/aspose-words-21.1-jdk17.jar b/jar/aspose-words-21.1-jdk17.jar
new file mode 100644
index 0000000..7429c78
--- /dev/null
+++ b/jar/aspose-words-21.1-jdk17.jar
Binary files differ
diff --git a/src/main/java/com/ots/common/utils/poi/WordUtil.java b/src/main/java/com/ots/common/utils/poi/WordUtil.java
index 7b702b0..2912bf1 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -1290,11 +1290,27 @@
XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(getTemplateDownLoadPathByUpLoad(fileName)));
- //璁剧疆鏂囨湰
- changeText(document, textMap);
+ if (StringUtils.equals(reportType, ReportTypeEnum.JAQ.getCode())) {
+ //璁剧疆鏂囨湰妗�
+ changeTextBox(document, textMap);
- //璁剧疆鏂囨湰妗�
- changeTextBox(document, textMap);
+ //璁剧疆鏂囨湰
+ changeText(document, textMap);
+ }else {
+ //璁剧疆鏂囨湰
+ changeText(document, textMap);
+
+ //璁剧疆鏂囨湰妗�
+ changeTextBox(document, textMap);
+ }
+
+// //璁剧疆鏂囨湰妗�
+// changeTextBox(document, textMap);
+//
+// //璁剧疆鏂囨湰
+// changeText(document, textMap);
+
+
//鎻掑叆琛ㄦ牸
addTableValue(document, autoTableMap);
diff --git a/src/main/java/com/ots/project/system/user/controller/LoginController.java b/src/main/java/com/ots/project/system/user/controller/LoginController.java
index c75df43..9a059e8 100644
--- a/src/main/java/com/ots/project/system/user/controller/LoginController.java
+++ b/src/main/java/com/ots/project/system/user/controller/LoginController.java
@@ -24,9 +24,9 @@
String lang = request.getParameter("lang");
String noLogin = "{\"code\":\"1\",\"msg\":\"鏈櫥褰曟垨鐧诲綍瓒呮椂銆傝閲嶆柊鐧诲綍\"}";
if("zh_CN".equals(lang)){
- noLogin = "";
+ noLogin = "{\"code\":\"1\",\"msg\":\"鏈櫥褰曟垨鐧诲綍瓒呮椂銆傝閲嶆柊鐧诲綍\"}";
}else if("en_US".equals(lang)){
- noLogin = "";
+ noLogin = "{\"code\":\"1\",\"msg\":\"Time out. Please log in again.\"}";
}
if (ServletUtils.isAjaxRequest(request)) {
--
Gitblit v1.9.1