From f73dbcd6c21d28ab1e98840eee73c6d09bd0f929 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 27 Aug 2024 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java
index 330a502..8c64478 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java
@@ -327,8 +327,10 @@
String holeText = "";
if (norspi.getIsGate().equals("是")) {
gateText = "有闸控制";
- String hole = norspi.getGateNum() == 1 ? "单" : String.valueOf(norspi.getGateNum());
- holeText = StringUtil.format("，{}孔", hole);
+ if (null != norspi.getGateNum()) {
+ String hole = norspi.getGateNum() == 1 ? "单" : String.valueOf(norspi.getGateNum());
+ holeText = StringUtil.format("，{}孔", hole);
+ }
} else {
gateText = "无闸控制";
}
--
Gitblit v1.9.3