app查询光电修改提交

zhangnaisong

2024-03-16 377f8bd94743a102b321b313d7e0824b39efa274

 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;
    }