From a70d0dfe221e06381b6e290d1dab85c9ab4fdc31 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 三月 2024 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 5 +++--
1 files changed, 3 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 f4c899e..7f7c334 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
@@ -355,6 +355,7 @@
ardChannel.setDeviceId(camera.getId());
List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
if (ardChannels != null) {
+ ardChannels.stream().sorted();
camera.setChannelList(ardChannels);
}
Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
@@ -563,8 +564,8 @@
}
@Override
- public List<Map<String, Object>> getCamerasByDeptId(Long deptId) {
- List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptId);
+ public List<Map<String, Object>> getCamerasByDeptId(Long deptId,String userId) {
+ List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptId,userId);
return result;
}
--
Gitblit v1.9.3