From 8515386b560836fdff3205beb6f493b381ccd185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= <soldierliuli@hotmail.com>
Date: Thu, 21 Jul 2022 20:10:38 +0800
Subject: [PATCH] fix

---
 .../device/repository/DeviceArchivesTagRepository.java    | 8 ++++++++
 .../storeroom/modules/device/service/impl/DeviceImpl.java | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/storeroom/src/main/java/com/storeroom/modules/device/repository/DeviceArchivesTagRepository.java b/storeroom/src/main/java/com/storeroom/modules/device/repository/DeviceArchivesTagRepository.java
index 81c27e8..239ade1 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/repository/DeviceArchivesTagRepository.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/repository/DeviceArchivesTagRepository.java
@@ -52,4 +52,12 @@ public interface DeviceArchivesTagRepository extends JpaRepository<DeviceArchive
     List<DeviceArchivesTag> findByAreaNo(Integer areaNo);
 
 
+    /**
+     * 根据设备id查询
+     * @param deviceInfoId
+     * @return
+     */
+    List<DeviceArchivesTag> findByDeviceInfoId(String deviceInfoId);
+
+
 }
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java
index 0837d61..18a2344 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java
@@ -382,6 +382,14 @@ public class DeviceImpl implements DeviceService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void Delete(Set<String> deviceInfoId) {
+
+        deviceInfoId.forEach(item -> {
+            List<DeviceArchivesTag> deviceArchivesTag = deviceArchivesTagRepository.findByDeviceInfoId(item);
+            if (deviceArchivesTag.size() != 0) {
+                deviceArchivesTagRepository.deleteAll(deviceArchivesTag);
+            }
+
+        });
         deviceInfoRepository.deleteAllById(deviceInfoId);
     }