From 1c30a4f6ef5fd2ec3bac0f51f945e369fcf5745d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 14 四月 2022 17:23:47 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java
index ee3bd4c..a211079 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java
@@ -37,7 +37,8 @@
List<PoleBinding> list = list(eq);
if (list.size() != 0) {
for (PoleBinding poleBinding : list) {
- if (poleBinding.getDeviceType().equals(deviceType)) {
+ //鍏呯數妗╃殑缁戝畾鏄綉缁滆姹傛槸甯﹁繃鏉ョ殑鐏潌淇℃伅锛岃鍏佽鐩存帴淇敼
+ if (poleBinding.getDeviceType().equals(deviceType) && deviceType != 2) {
throw new BusinessException("璇ョ伅鏉嗗凡缁戝畾杩囩浉鍚岀被鍨嬭澶�");
}
}
@@ -54,6 +55,8 @@
} else {
one.setPoleId(poleId);
one.setDeviceType(param.getDeviceType());
+ one.setDeviceName(param.getDeviceName());
+ one.setDeviceCode(param.getDeviceCode());
return updateById(one);
}
}
--
Gitblit v1.9.3