bug修复

zoniot-common/zoniot-iot-sync/src/main/java/com/bz/zoneiot/iot/sync/dto/AlarmOfflineDTO.java

@@ -22,6 +22,7 @@ public class AlarmOfflineDTO {
     @ApiModelProperty(value="属性标识符",position = 6)
     private String code;
 
+    @ApiModelProperty(value="客户ID",position = 6)
     private Long customerId;
 
     private Integer productId;

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/AbstractReportService.java

@@ -567,7 +567,12 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
     **/
     public Page<ReportVo> findPageReport(IPage<ReportDto> page, ReportQueryDto queryDto, boolean isPipe) {
         // 查询场景下的所有设备信息
-        List<DeviceVo> devices = devicesToList(queryDto.getIds());
+        List<DeviceVo> devices = null;
+        if (isPipe){
+            devices = devicesToList(queryDto.getIds());
+        } else {
+            devices = findDevices(queryDto.getIds());
+        }
         if (devices.size() == 0) {
             return new Page<>();
         }