From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理:辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单:标签打印功能调整 3.人员:培训计划导入导出添加【培训大类】字段 4.业务管理:报检新增【物料属性】字段选择,其余页面添加【物料属性】查询条件以及数据回显

---
 ruoyi-system/src/main/resources/mapper/system/UserMapper.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index f16af39..e3a4e6e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -25,7 +25,7 @@
         is_custom
         from user
         where del_flag = '0'
-        and id != ) a
+        and id != 1) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
@@ -88,9 +88,12 @@
         select id,
                account,
                name,
-               name_en
+               name_en,
+               status
         from user u
-        where depart_lims_id = (select u2.depart_lims_id
+        where depart_lims_id is not null
+          and depart_lims_id != ''
+          and depart_lims_id = (select u2.depart_lims_id
                                 from user u2
                                 where u2.id = #{userId})
     </select>

--
Gitblit v1.9.3