From ec1f20c31d64ddbc5242c3942902bc5233a8a140 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 四月 2025 10:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 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..4a16c32 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,7 +88,8 @@
select id,
account,
name,
- name_en
+ name_en,
+ status
from user u
where depart_lims_id = (select u2.depart_lims_id
from user u2
--
Gitblit v1.9.3