From 1d6d1ac56a02a884af47d584ed5f9ceffd9936ba Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期二, 25 七月 2023 13:25:07 +0800 Subject: [PATCH] 获取所有app用户pc接口增加最后位置信息 app任务详情增加完成状态和打卡图片 修复app用户任务列表分页total不正确的问题 --- ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java index a7ca092..e0efc82 100644 --- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java +++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java @@ -148,14 +148,14 @@ @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�") public AjaxResult getDeptAndCamera() { - Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false); + Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true); return AjaxResult.success(deptAndCamera); } @GetMapping("/getDeptAndCameraWithCheckBox") @ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)") public AjaxResult getDeptAndCameraWithCheckBox() { - Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true); + Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false); return AjaxResult.success(deptAndCamera); } @PostMapping("/getNearCamerasBycoordinate") -- Gitblit v1.9.3