From 91d11cc2c3b7a85494cd4ad0029310a1ae061d34 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 20 五月 2022 17:14:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index 361b090..45fcc1a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -226,16 +226,21 @@
);
//淇敼鐏潌浠诲姟缁戝畾鍏崇郴琛�
for (LightTaskPoleRelation bean : lightTaskPoleRelationList) {
+ LightTaskPoleRelation one = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, bean.getPoleId()));
+
//鎴愬姛鎵嶄慨鏀癸紝澶辫触涓嶅彉
if (bean.getIssueStatus() == 0) {
-
- LightTaskPoleRelation one = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, bean.getPoleId()));
if (one != null) {
one.setTaskId(newLightTask.getTaskId());
lightTaskPoleRelationService.updateById(one);
} else {
lightTaskPoleRelationService.save(bean);
}
+ } else {
+ if (one == null) {
+ lightTaskPoleRelationService.save(bean);
+ }
+
}
}
--
Gitblit v1.9.3