From 8665daa7aa863f96d0d8f27c167edae1efc38022 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期五, 31 七月 2026 14:46:19 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
ruoyi-system/src/main/resources/mapper/system/SysVisitorRecordMapper.xml | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysVisitorRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysVisitorRecordMapper.xml
index 4fa43d4..0fe2613 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysVisitorRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysVisitorRecordMapper.xml
@@ -65,11 +65,30 @@
id_card,
register_type,
interviewee_name,
- interviewee_dept,
+ coalesce(
+ (
+ select d.dept_name
+ from t_employee e
+ inner join sys_dept d on d.dept_id = e.dept_id and d.del_flag = '0'
+ where e.employee_name = t_visitor_record.interviewee_name
+ and e.del_flag = '0'
+ order by e.employee_id
+ limit 1
+ ),
+ nullif(interviewee_dept, '')
+ ) as interviewee_dept,
receiver_name,
receiver_verify_method,
visit_area_ids,
- visit_area_names,
+ coalesce(
+ (
+ select group_concat(a.area_name order by find_in_set(a.area_id, t_visitor_record.visit_area_ids) separator ',')
+ from t_visit_area a
+ where a.del_flag = '0'
+ and find_in_set(a.area_id, t_visitor_record.visit_area_ids)
+ ),
+ nullif(visit_area_names, '')
+ ) as visit_area_names,
plate_no,
visit_reason,
valid_start_time,
--
Gitblit v1.7.1