From 30c735adf2e05ecada226ad24ba9eaabec888270 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期四, 10 四月 2025 13:51:24 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 2 +- 1 files changed, 1 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 7cf2d9f..8e4acc0 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 @@ -446,7 +446,7 @@ // 日期相关参数处理 fill(templateParam, "remark", contract.getRemark()); - fill(templateParam, "houseUseScope", contract.getHouseUseScope()); + fill(templateParam, "houseUseScope", StringUtils.isNotEmpty(contract.getHouseUseScope()) ? contract.getHouseUseScope() : "————"); fill(templateParam, "days", ChronoUnit.DAYS.between( contract.getStartTime(), contract.getEndTime())); -- Gitblit v1.7.1