From c5f6f451fcd2a5257315590c5a256766fa68e433 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 19 Aug 2024 14:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
index c0d2f18..ca98cf2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
@@ -79,7 +79,7 @@
params.put("挡水建筑物泄洪建筑物正常溢洪道", tbWordVO.getBuildingText());
params.put("主坝信息", tbWordVO.getMainDamInfo());
params.put("挡水建筑物泄洪建筑物正常溢洪道等详情", tbWordVO.getBuildingInfo());
- params.put("输水建筑物输水道形式", tbWordVO.getAqueductType());//若有两个以上输水建筑物，则描述设计流量较大的，若只有一个输水建筑物则去掉“主要”
+ params.put("输水建筑物输水道形式", StringUtil.isNotBlank(tbWordVO.getAqueductType())?tbWordVO.getAqueductType().trim():"");//若有两个以上输水建筑物，则描述设计流量较大的，若只有一个输水建筑物则去掉“主要”
params.put("断面尺寸", tbWordVO.getSection());
params.put("进口底槛高程", tbWordVO.getThresholdElevation());
params.put("设计流量", tbWordVO.getDesignFlow());
--
Gitblit v1.9.3