集中器抄表率bug修复 PengDi@2021/1/4

smart-city-platform/src/main/java/com/bz/smart_city/controller/water/WaterMeterReadController.java

@@ -624,8 +624,10 @@ public class WaterMeterReadController {
 		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
 		// 1,设置数据权限
 		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
+        // 修改为只按照客户数据权限控制
+        // condition.setProgramItems(programItems);
+        condition.setSiteId(loginUser.getSiteId());
+        condition.setCustomerIds(UserUtil.getCustomerIds());
 		// 2,设置其他查询条件
         condition.setDeviceTypeId(deviceTypeId);
 		condition.setPeriod(period);
@@ -655,8 +657,10 @@ public class WaterMeterReadController {
         List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
         // 1,设置数据权限
         CommonQueryCondition condition = new CommonQueryCondition();
-        condition.setProgramItems(programItems);
+        // 修改为只按照客户数据权限控制
+        // condition.setProgramItems(programItems);
         condition.setSiteId(loginUser.getSiteId());
+        condition.setCustomerIds(UserUtil.getCustomerIds());
         // 2,设置其他查询条件
         condition.setDeviceTypeId(deviceTypeId);
         condition.setPeriod(period);