Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseGgpFacilityServiceImpl.java

@@ -321,7 +321,8 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
             map.put("buildId", baseFacilityBuildList.get(0).getId());
         }
         LambdaQueryWrapper<DmpProductInfo> queryWrapper2 = Wrappers.lambdaQuery();
-        queryWrapper2.eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
+        queryWrapper2.eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId())
+                .eq(DmpProductInfo::getDeleteFlag,0);
         List<DmpProductInfo> dmpProductInfoList = dmpProductInfoService.list(queryWrapper2);
         if (CollectionUtils.isNotEmpty(baseFacilityDeviceList)) {
             List<String> deviceIdList = new ArrayList<>();