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