From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index fc1420f..1ab165d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -641,7 +641,10 @@
             if (pole == null) {
                 throw new BusinessException("鐏潌涓嶅瓨鍦�");
             }
-            pole.setClientId(clientId);
+            pole.setUserId(clientId);
+            if(!clientService.findClientId(clientId)){
+                pole.setClientId(clientService.getClientId(clientId));
+            }
             r = updateById(pole);
 
             if (!r) {

--
Gitblit v1.9.3