From 3ee306e4a8db75680960f5eb4eec9fb7d05b5f29 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期五, 24 七月 2026 16:21:54 +0800
Subject: [PATCH] Merge branch 'master' into electron_dev
---
ruoyi-system/src/main/resources/mapper/system/EmployeeMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/EmployeeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/EmployeeMapper.xml
index cf0ab93..a5f5621 100644
--- a/ruoyi-system/src/main/resources/mapper/system/EmployeeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/EmployeeMapper.xml
@@ -22,7 +22,7 @@
<!-- 人脸图片不参与本接口逻辑，且 longtext 体积较大，列表中排除，减少不必要的数据传输 -->
<sql id="Base_Column_List">
- employee_id, dept_id, employee_name, employee_no, contact_phone_cipher,
+ employee_id, dept_id, employee_name, face_image, employee_no, contact_phone_cipher,
contact_phone_hash, `position`, card_no, enabled, del_flag,
create_by, create_time, update_by, update_time
</sql>
@@ -50,7 +50,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_employee
- AND enabled = 1
+ where enabled = 1
AND del_flag = '0'
</select>
--
Gitblit v1.7.1