Merge branch 'master' of http://120.76.47.59:3000/liu_li/yxk_StoreroomSystem into master

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);
+
+
 }

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);
     }