Browse Source

fix: 空间内的系统,穿透属性查询处理-设备

lvxianyun 3 years ago
parent
commit
2cdb4e55d7

+ 7 - 2
src/main/java/com/persagy/proxy/adm/service/impl/AdmSpaceServiceImpl.java

@@ -194,10 +194,15 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
         List<AdmEquipment> equipmentList = new ArrayList<>();
         for(AdmSpace vo:vos) {
             // 收集设备对象
-            if(CollUtil.isEmpty(vo.getEquipment())) {
+            if(CollUtil.isEmpty(vo.getEquipment()) && CollUtil.isEmpty(vo.getEquipmentFor())) {
                 continue;
             }
-            equipmentList.addAll(vo.getEquipment());
+            if(CollUtil.isNotEmpty(vo.getEquipment())) {
+                equipmentList.addAll(vo.getEquipment());
+            }
+            if(CollUtil.isEmpty(vo.getEquipmentFor())) {
+                equipmentList.addAll(vo.getEquipmentFor());
+            }
         }
         // 对象扩展属性赋值
         equipmentService.ensureSpecialValues(context, equipmentList);