diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceData/dto/GetReport2Request.java b/src/main/java/cn/lihongjie/coal/pdcDeviceData/dto/GetReport2Request.java index 7783e5ba..bb9d3665 100644 --- a/src/main/java/cn/lihongjie/coal/pdcDeviceData/dto/GetReport2Request.java +++ b/src/main/java/cn/lihongjie/coal/pdcDeviceData/dto/GetReport2Request.java @@ -32,4 +32,7 @@ hour private String td; + + private String organizationId; + } diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java index fe4dfb26..894dcf45 100644 --- a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java +++ b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java @@ -96,6 +96,8 @@ public class PdcDeviceDataService request.setTd("1 " + request.getTimeDimension()); + request.setOrganizationId(Ctx.currentUser().getOrganizationId()); + return JpaUtils.execNativeQuery( em, FreeMakerUtils.render( @@ -117,6 +119,8 @@ public class PdcDeviceDataService where dd.time >= :startTime and dd.time <= :endTime + and dd.organization_id = :organizationId + <#if deviceGroup??> and pd.device_group like '%' || :deviceGroup || '%'