From d0ccd668fa9ad8ebbb57ad716b58290602794ca5 Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Fri, 22 Aug 2025 16:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=AE=BE=E5=A4=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/attendanceVo/AttendanceAreaDeviceVo.java    |  3 +++
 .../attendanceImpl/AttendanceAreaServiceImpl.java  | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java
index 3dec0c99..4440af3c 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java
@@ -9,6 +9,7 @@ import org.dromara.sis.api.domain.RemoteSisDeviceManage;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -45,4 +46,6 @@ public class AttendanceAreaDeviceVo implements Serializable {
 
 
     private RemoteSisDeviceManage remoteSisDeviceManage;
+
+    private List<AttendanceAreaDevice> areaDevice;
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java
index 412fb53c..0cfc55a0 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java
@@ -54,7 +54,19 @@ public class AttendanceAreaServiceImpl implements IAttendanceAreaService {
      */
     @Override
     public AttendanceAreaVo queryById(Long id) {
-        return baseMapper.selectVoById(id);
+
+        AttendanceAreaVo attendanceAreaVo = baseMapper.selectVoById(id);
+        //根据id查询中间表数据
+        List<AttendanceAreaDeviceVo> attendanceAreaDeviceList = areaDeviceMapper.selectVoList(Wrappers.<AttendanceAreaDevice>lambdaQuery().eq(AttendanceAreaDevice::getAreaId, id));
+        //根据设备id集合查询设备数据
+        attendanceAreaDeviceList.forEach(item -> {
+            //根据deviceManageId查询设备数据
+            RemoteSisDeviceManage remoteSisDeviceManage = remoteDeviceService.queryDeviceById(item.getDeviceManageId());
+            item.setRemoteSisDeviceManage(remoteSisDeviceManage);
+            attendanceAreaVo.setAreaDevice(attendanceAreaDeviceList);
+        });
+
+        return attendanceAreaVo;
     }
 
     /**