From c3e8b19537332aa0e5282cae78d3ea9c9189fd4e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:50:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index da9ea5e..26353e6 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -78,18 +78,19 @@
// region = RegionCodeUtils.regionCodeConvertToName(regionCode);
// }
- //���������������
+ /* //���������������
List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
- List<Integer> organizationIds = new ArrayList<>();
+
for (Organization organization : childrenOrganization) {
organizationIds.add(organization.getId());
}
- organizationIds.add(organizationId);
+ organizationIds.add(organizationId);*/
//������������
QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
//������region������������������������������������������������������������������������������
//������region���������������������������������������������������������
+ List<Integer> organizationIds = deviceMapper.deviceOrgIdList(organizationId);
if (region != null){
queryMonitorPointsWrapper.eq(region, regionCode);
}
--
Gitblit v1.8.0