From fc21989ae9cde74aff82a9018087dd104d255f79 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 25 Jun 2023 17:11:47 +0800
Subject: [PATCH] 晋城版
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 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 81e0138..7afdb68 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -183,6 +183,9 @@
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat('%', #{user.cardid},'%')
</if>
+ <if test="user.unitName!=null and user.unitName != ''">
+ and bu.unit_name like concat('%', #{user.unitName},'%')
+ </if>
<if test="user.sortName!=null and user.sortName!=''">
ORDER BY bu.${user.sortName} ${user.sort},bu.id desc
</if>
@@ -289,6 +292,9 @@
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat('%', #{user.realName},'%')
</if>
+ <if test="user.unitName!=null and user.unitName != ''">
+ and bu.unit_name like concat('%', #{user.unitName},'%')
+ </if>
<if test="user.dispatch!=null and user.dispatch != ''">
<if test="user.dispatch == 0">
and bu.dispatch = #{user.dispatch}
@@ -391,6 +397,9 @@
</if>
<if test="user.nativeplace!=null and user.nativeplace != ''">
and nativeplace = #{user.nativeplace}
+ </if>
+ <if test="user.unitName!=null and user.unitName != ''">
+ and bu.unit_name like concat('%', #{user.unitName},'%')
</if>
<if test="user.sex!=null and user.sex != ''">
and sex = #{user.sex}
@@ -499,6 +508,9 @@
<if test="user.jurisdiction!=null and user.jurisdiction != ''">
and bu.jurisdiction = #{user.jurisdiction}
</if>
+ <if test="user.unitName!=null and user.unitName != ''">
+ and bu.unit_name like concat('%', #{user.unitName},'%')
+ </if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
@@ -538,6 +550,9 @@
</if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat('%', #{user.realName},'%')
+ </if>
+ <if test="user.unitName!=null and user.unitName != ''">
+ and bu.unit_name like concat('%', #{user.unitName},'%')
</if>
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
@@ -881,32 +896,22 @@
bu.cardid,
bu.nation,
bu.registered,
- if(bu.hold=1,"是","否") hold,
- bu.securitynumber
- from
- blade_user bu
- left join
- blade_dept bd
- on
- bu.dept_id = bd.id
- left join
- sys_information si
- on
- si.departmentid = bd.id
- left join
- sys_jurisdiction sj
- on
- sj.id = si.jurisdiction
- left join
- blade_role br
- on
- br.id = bu.role_id
- left join
- sys_training_registration str
- on
- bu.id = str.user_id
- where
- bu.is_deleted = 0
+ bu.unit_name unitName,
+ case when bu.education=1 then '初中及以下'
+ when bu.education=2 then '高中/中技/中专'
+ when bu.education=3 then '大专'
+ when bu.education=4 then '本科'
+ when bu.education=5 then '博士'
+ when bu.education=6 then '硕士'
+ else '' end as education,
+ bu.politicaloutlook,
+ bu.address
+ from blade_user bu left join blade_dept bd on bu.dept_id = bd.id
+ left join sys_information si on si.departmentid = bd.id
+ left join sys_jurisdiction sj on sj.id = si.jurisdiction
+ left join blade_role br on br.id = bu.role_id
+ left join sys_training_registration str on bu.id = str.user_id
+ where bu.is_deleted = 0
<if test="user.examinationType!=null and user.examinationType != ''">
<if test="user.examinationType == 0">
and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type ='')
@@ -920,6 +925,9 @@
</if>
<if test="user.isAvatar==2">
and (bu.avatar is null or bu.avatar="")
+ </if>
+ <if test="user.unitName!=null and user.unitName != ''">
+ and bu.unit_name like concat('%', #{user.unitName},'%')
</if>
<if test="user.isFingerprint==1">
and bu.fingerprint is not null and bu.fingerprint!=""
@@ -1041,7 +1049,7 @@
tenant_id,account,password,name,real_name,avatar,email,phone,sex,
role_id,dept_id,cardid,nativePlace,nation,fingerprint,education,
politicaloutlook,healstats,height,address,registered,securitynumber,
- hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time
+ hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time,unit_name
)
values
<foreach collection="list" item="user" separator=",">
@@ -1049,7 +1057,7 @@
#{user.tenantId},#{user.account},#{user.password},#{user.name},#{user.realName},#{user.avatar},#{user.email},#{user.phone},#{user.sex},
#{user.roleId},#{user.deptId},#{user.cardid},#{user.nativeplace},#{user.nation},#{user.fingerprint},#{user.education},
#{user.politicaloutlook},#{user.healstats},#{user.height},#{user.address},#{user.registered},#{user.securitynumber},
- #{user.hold},#{user.jurisdiction},#{user.examinationType},#{user.status},#{user.isDeleted},#{user.dispatch},#{user.createTime}
+ #{user.hold},#{user.jurisdiction},#{user.examinationType},#{user.status},#{user.isDeleted},#{user.dispatch},#{user.createTime},#{user.unitName}
)
</foreach>
</insert>
--
Gitblit v1.9.3