From 7e4faf42f2054d1fb42a87d2892124651c92888b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 四月 2025 15:18:40 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 3 ++-
1 files changed, 2 insertions(+), 1 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..7147c35 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
@@ -395,7 +395,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 +403,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())
--
Gitblit v1.7.1