From 436b955086030caec4513022c1f5127470ad2b14 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 28 十二月 2025 20:54:21 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index df76b7d..38dc7c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -464,16 +464,25 @@
String li_person = "浠囩縺";
String sh_person = "鏇剧憺鑾�";
ArchiveRecords archiveRecords = iArchiveRecordsService.selectArchiveRecordsById(id);
+ if(!StringUtils.isEmpty(archiveRecords.getLiPerson()))
+ li_person = archiveRecords.getLiPerson();
ArchiveProjectName tmp = new ArchiveProjectName();
tmp.setName(archiveRecords.getProjectName());
List<ArchiveProjectName> projectName = iArchiveProjectNameService.selectArchiveProjectNameList(tmp);
if(!projectName.isEmpty())
{
- if(StringUtils.isEmpty(projectName.get(0).getCompanyName()))
+ System.out.println(projectName.get(0).getCompanyName());
+ if(!StringUtils.isEmpty(projectName.get(0).getCompanyName()))
compName = projectName.get(0).getCompanyName();
- if(StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
- li_person = projectName.get(0).getCreatePerson();
+ if(!StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
+ sh_person = projectName.get(0).getCreatePerson();
+
+ System.out.println(compName+"--+"+sh_person);
+
}
+
+
+ System.out.println(compName+"--+"+sh_person);
// pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), id);
//鎷垮埌鐩稿叧鏁版嵁
List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(id));
@@ -507,6 +516,8 @@
hs.put("texPages", texPages);
hs.put("volumeNumber", recordId);
hs.put("company", compName);
+ hs.put("liPerson", li_person);
+ hs.put("shPerson", sh_person);
hs.put("time", cdt);
if (!getLicense()) {
--
Gitblit v1.9.1