From 75e610720fbd3655d7a2b13012949cb018174fd8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 四月 2025 15:56:03 +0800
Subject: [PATCH] 代码
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 1 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java | 3 +++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
index 7fb9d31..6162b94 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
@@ -200,6 +200,7 @@
for (XWPFTableCell cell : row.getTableCells()) {
for (XWPFParagraph paragraph : cell.getParagraphs()) {
replaceParagraph(paragraph, dataMap);
+ replaceParagraph1(paragraph);
}
}
}
@@ -281,10 +282,12 @@
}
}
private static void replaceParagraph1(XWPFParagraph paragraph) throws IOException, InvalidFormatException {
+ System.out.println("有image1");
List<XWPFRun> runs = paragraph.getRuns();
for (XWPFRun r : runs) {
String text = r.getText(0);
if (text != null && text.contains("{{image}}")) {
+ System.out.println("有image2");
r.setText("", 0);
FileInputStream is = new FileInputStream("/usr/local/project/file/1.jpg");
r.addBreak();
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 6e8189f..15a9a4c 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -267,7 +267,6 @@
.stream().map(TBill::getContractId).collect(Collectors.toList());
if(contractIds.isEmpty()){
myToDoVO.setOverdueCount(0);
-
}else{
int overdueCount = contractService.lambdaQuery().in(TContract::getId, contractIds).list()
.stream().map(TContract::getTenantId).distinct().collect(Collectors.toList()).size();
--
Gitblit v1.7.1