From e83e592db5c5caab627b01a59bd6fc2c1cb4ec86 Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Fri, 10 Oct 2025 11:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E8=AE=B0=E5=BD=95=E8=A1=A8=E4=B8=AD=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=B5=B7=E5=BA=B7=E6=8E=A5=E5=8F=A3=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/identification_record_service.py     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/ruoyi-fastapi-backend/module_admin/service/identification_record_service.py b/ruoyi-fastapi-backend/module_admin/service/identification_record_service.py
index eb1605e..40c7dea 100644
--- a/ruoyi-fastapi-backend/module_admin/service/identification_record_service.py
+++ b/ruoyi-fastapi-backend/module_admin/service/identification_record_service.py
@@ -42,16 +42,20 @@ class Identification_recordService:
         
         # 获取门禁点列表, 获取机器人添加的门禁设备列表,有权限的.
         door_index_code_list = await DoorDao.get_door_index_code_list(query_db, permission='1')
-        haikang_record_list = await HaikangUtil.query_door_events_v2(door_index_code_list
-                                                                     ,pageNo=query_object.page_num
-                                                                     , pageSize=max(t-query_object.page_size, t-len(identification_record_list_result.rows)) 
-                                                                     ,startTime=start_time, endTime=end_time
-                                                                     ,personName=query_object.person_name)
+        try:
+            haikang_record_list = await HaikangUtil.query_door_events_v2(door_index_code_list
+                                                                        ,pageNo=query_object.page_num
+                                                                        , pageSize=max(t-query_object.page_size, t-len(identification_record_list_result.rows)) 
+                                                                        ,startTime=start_time, endTime=end_time
+                                                                        ,personName=query_object.person_name)
+            return identification_record_list_result.rows + cls.parse_haikang_record_list(haikang_record_list[1]["list"])
+        except Exception as e:
+            print(e)
 
         # print(identification_record_list_result.rows)
         # print("*"*100)
         # print(haikang_record_list[1])
-        return identification_record_list_result.rows + cls.parse_haikang_record_list(haikang_record_list[1]["list"])
+        return identification_record_list_result.rows
         # return None