Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-03-26 493caef7413992d0215b9c2e2bcedd30471d89e7

 ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java

@@ -220,7 +220,8 @@
    @ApiOperation("获取权限及下属权限下的相机")

    public AjaxResult getCamerasByDeptId() {

        Long deptId = SecurityUtils.getDeptId();

        List<Map<String,Object>> camerasList = ardCamerasService.getCamerasByDeptId(deptId);

        String userId = SecurityUtils.getUserId();

        List<Map<String,Object>> camerasList = ardCamerasService.getCamerasByDeptId(deptId,userId);

        return AjaxResult.success(camerasList);

    }