From 96b35b89e061cc90cd6404fd9941102eedab36ab Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 14 四月 2022 14:20:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 e6ae5f0..ee3bd4c 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
@@ -35,7 +35,7 @@
// }
LambdaQueryWrapper<PoleBinding> eq = Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId);
List<PoleBinding> list = list(eq);
- if (list.size() != 0){
+ if (list.size() != 0) {
for (PoleBinding poleBinding : list) {
if (poleBinding.getDeviceType().equals(deviceType)) {
throw new BusinessException("璇ョ伅鏉嗗凡缁戝畾杩囩浉鍚岀被鍨嬭澶�");
@@ -52,7 +52,9 @@
poleBinding.setDeviceCode(param.getDeviceCode());
return save(poleBinding);
} else {
- throw new BusinessException("璇ヨ澶囧凡缁戝畾杩�");
+ one.setPoleId(poleId);
+ one.setDeviceType(param.getDeviceType());
+ return updateById(one);
}
}
--
Gitblit v1.9.3