From 021f085016565e81566bdb955d2296d9da6b0bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 20:10:52 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index c66e92e..5c95dc4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -80,7 +80,6 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.stream.Collectors;
/**
* <p>
@@ -395,7 +394,7 @@
Map<String, Object> templateParam = new HashMap<>(5);
fill(templateParam, "contractNumber", contract.getContractNumber());
fill(templateParam, "partyOneName", contract.getPartyOneName());
- fill(templateParam, "partyTwoName", contract.getPartyTwoName());
+
if (Objects.nonNull(tenant)) {
fill(templateParam, "mailAddress", tenant.getMailAddress());
@@ -403,6 +402,7 @@
fill(templateParam, "residentName", tenant.getResidentName());
fill(templateParam, "bankNumber", tenant.getBankNumber());
fill(templateParam, "bankName", tenant.getBankName());
+ fill(templateParam, "partyTwoName", tenant.getLessee());
// 企业、政府机构、国有企业
if (Objects.nonNull(tenant.getTenantType())
@@ -594,7 +594,7 @@
if (Objects.isNull(contract)) {
throw new ServiceException("合同不存在");
}
- if (StringUtils.isNotBlank(contract.getContractFile())) {
+ /* if (StringUtils.isNotBlank(contract.getContractFile())) {
List<String> contractFileList = Arrays.stream(contract.getContractFile().split(",")).collect(Collectors.toList());
List<String> memoryList = Arrays.stream(contract.getMemory().split(",")).collect(Collectors.toList());
List<String> contractNameList = Arrays.stream(contract.getContractFileName().split(",")).collect(Collectors.toList());
@@ -608,7 +608,10 @@
contract.setContractFile(dto.getContractFile());
contract.setContractFileName(dto.getContractFileName());
contract.setMemory(dto.getMemory());
- }
+ }*/
+ contract.setContractFile(dto.getContractFile());
+ contract.setContractFileName(dto.getContractFileName());
+ contract.setMemory(dto.getMemory());
return R.ok(contractService.updateById(contract));
}
--
Gitblit v1.7.1