From 49ca0cffd43f1ceb119d84232ecc92186d5abb63 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期一, 03 六月 2024 16:28:26 +0800
Subject: [PATCH] 修复雷达强制引导只获取大光电
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
index 622ed8a..9fd6321 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
@@ -292,7 +292,15 @@
}
public List findOptions(ArdCameras ardCameras) {
- List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
+ //List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
+ List<Long> subDeptIdList = sysDeptMapper.selectDeptIdBySub(SecurityUtils.getDeptId());//涓嬪睘鍙婃湰鏉冮檺
+ List<Long> ownDeptIdList= sysDeptMapper.selectRoleDeptIdByUsersId(SecurityUtils.getUserId());//鑷畾涔夋潈闄�
+ HashSet<Long> deptIdSet = new HashSet();//鍘婚噸
+ deptIdSet.addAll(subDeptIdList);
+ deptIdSet.addAll(ownDeptIdList);
+ List<Long> deptIdList = new ArrayList();
+ deptIdList.addAll(deptIdSet);//绗﹀悎鏉′欢鐨勫叏閮ㄦ潈闄�
+ List<ArdCameras> options = ardCamerasMapper.findTowerCamerasBySubAndOwnDeptIds(deptIdList);
for (ArdCameras camera :
options) {
ArdChannel ardChannel = new ArdChannel();
@@ -444,7 +452,8 @@
childMap.put("name", childDept.getDeptName());
childMap.put("deptId", childDept.getDeptId());
childMap.put("disabled", disabled);
- Map<String, Object> map1 = fetchChildDepartments(childDept, disabled);
+ //Map<String, Object> map1 = fetchChildDepartments(childDept, disabled);
+ Map<String, Object> map1 = fetchChildDepartments(ownDeptIdList,childDept, disabled);
childMap.putAll(map1);
childList.add(childMap);
}
--
Gitblit v1.9.3