From 0570e8de9ba479d67dfcfdeebe1cfccc4a56f812 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 11:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java
index 3529efb..3e8106c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java
@@ -93,6 +93,7 @@
*/
@Override
public boolean deleteFwDefenseSceneManage(List<Long> longList) {
+ //删除场景管理
boolean b = deleteLogic(longList);
if (b) {
// 1.遍历所有删除的场景管理ID
@@ -102,6 +103,9 @@
List<Long> deviceIdList = baseMapper.selectDeviceId(sceneManageId);
AllDeviceId.addAll(deviceIdList);
}
+ if (AllDeviceId == null || AllDeviceId.isEmpty()) {
+ return true;
+ }
// 3.禁用设备
return fwDeviceService.update(Wrappers.<FwDeviceEntity>lambdaUpdate()
.set(FwDeviceEntity::getIsEnabled, 0)
--
Gitblit v1.9.3