From d170546ea4498d282c9cfef6258e4498aed7835e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 15:57:22 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index 3a63f69..e4a1a47 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -124,8 +124,7 @@
             switch (param.getDeviceType()) {
                 case 0:
                     Pole pole = poleService.getById(poleId);
-                    if (!param.getDeviceCode().equals(pole.getDeviceCode())) {
-//                    if (!pole.getDeviceCode().equals(param.getDeviceCode())) {
+                    if (pole != null) {
                         pole.setPoleName(param.getDeviceName());
                         pole.setDeviceCode(param.getDeviceCode());
                         poleService.updateById(pole);

--
Gitblit v1.9.3