From 3c1126fbff1aaed94a2e16c2ef98a03e36bf49f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 May 2022 12:01:13 +0800
Subject: [PATCH] 心理咨询，业主反馈修改，bean copy 修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 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 ebae64d..176b471 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -555,7 +555,7 @@
select #{user.deptId} as id,
'全部' as name,
0 as parentId
- from blade_user
+ from blade_user limit 1
)
union all
@@ -587,7 +587,7 @@
where
bu.is_deleted = 0
and bu.status = 1
- and (bu.examination_type != 1 or bu.examination_type is null)
+ and ((bu.examination_type != 1 and bu.examination_type != 2) or bu.examination_type is null)
and (hold = 2 or hold = 3)
and bd.id = #{user.deptId}
and br.role_alias = '保安'
@@ -1070,30 +1070,15 @@
<!-- 批量更新用户数据 -->
<update id="batchUpdateUserList" parameterType="java.util.List">
- <foreach collection="list" item="user" index="index" open="" close="" separator=";">
- update blade_user
- <set>
- account=${user.account}
- </set>
- <set>
- password=${user.password}
- </set>
- <set>
- real_name=${user.realName}
- </set>
- <set>
- phone=${user.phone}
- </set>
- <set>
- registered=${user.registered}
- </set>
- <set>
- securitynumber=${user.securitynumber}
- </set>
- <set>
- hold=${user.hold}
- </set>
- where id = ${user.id}
+ <foreach collection="list" item="user" index="index" separator=";">
+ update blade_user
+ set account = #{user.account},
+ PASSWORD = #{user.password},
+ real_name = #{user.realName},
+ phone = #{user.registered},
+ registered = #{user.registered},
+ securitynumber = #{user.securitynumber},
+ hold = #{user.hold} where id = #{user.id}
</foreach>
</update>
--
Gitblit v1.9.3