From 62cd133e894d8cc8d527d5e94a4310794e03f763 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 14 Nov 2023 14:12:20 +0800
Subject: [PATCH] 试用期校验去除
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 6f32b91..6da776c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -211,7 +211,21 @@
</select>
<select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
- SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
+ SELECT u.id, u.tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id,
+ j.dept_name as fwfw,
+ w.dept_name as gzd FROM blade_user u
+ LEFT JOIN sys_jurisdiction j on j.id = u.jurisdiction
+ LEFT JOIN sys_jurisdiction w on w.id = u.workjurisdiction
+ where 1 = 1 and u.is_deleted = 0
+ <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ and (jurisdiction = #{user.jurisdiction} or workjurisdiction = #{user.jurisdiction})
+ </if>
+ <if test="user.workjurisdiction!=null and user.workjurisdiction != ''">
+ and workjurisdiction = #{user.workjurisdiction}
+ </if>
+ <if test="user.realName!=null and user.realName != ''">
+ and real_name like concat('%',#{user.realName},'%')
+ </if>
</select>
<!--根据用户编号查询用户信息-->
--
Gitblit v1.9.3