From 0f9ee3de2c058b934cb6e495f9120f7764983e1f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 27 九月 2022 09:23:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index a80c145..a9b9dec 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -274,7 +274,7 @@
// FEA584000CFE040004FFFF0105954FAA7F1123C0CB -----------commonFrame
A5AtmosphereQueryVersionReportInnerFrame a5AtmosphereQueryVersionReportInnerFrame =
new A5AtmosphereQueryVersionReportInnerFrame().transformFrame(commonFrame.getPayload());
- if (a5AtmosphereQueryVersionReportInnerFrame.isValidate()) {
+ if (a5AtmosphereQueryVersionReportInnerFrame != null && a5AtmosphereQueryVersionReportInnerFrame.isValidate()) {
return a5AtmosphereQueryVersionReportInnerFrame.getVersion();
} else {
throw new BusinessException("鏁版嵁鏍￠獙寮傚父锛�");
--
Gitblit v1.9.3