From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
index 9e39104..34d793f 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
@@ -90,7 +90,8 @@
      */
     public ArdCameras checkCameraIpAndPortUnique(@Param("ip") String ip, @Param("port")Integer port);
 
-    public List<Map<String, Object>> getCamerasByDeptId(Long deptId);
+    //public List<Map<String, Object>> getCamerasByDeptId(@Param("deptId")Long deptId,@Param("userId")String userId);
+    public List<Map<String, Object>> getCamerasByDeptId(@Param("deptIdList")List<Long> deptIdList,@Param("userId")String userId);
 
     public Boolean getCameraOperationByCameraId(@Param("id") String id, @Param("userId") String userId);
 

--
Gitblit v1.9.3