From 62084735c1f5d6b6d4771aadf4d9241479a4d4ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 15:06:16 +0800
Subject: [PATCH] 用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 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 56a8d42..1a1350f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -36,10 +36,10 @@
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account = #{user.account}
+ and account LIKE CONCAT('%',#{user.account},'%')
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name = #{user.realName}
+ and real_name LIKE CONCAT('%',#{user.realName},'%')
</if>
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
@@ -77,7 +77,7 @@
<select id="getUserList" resultType="org.springblade.modules.system.entity.User">
SELECT * FROM blade_user where 1=1
<if test="user.farmId!=null and user.farmId!=''">
- and find_in_set(farm_id,#{user.farmId})
+ and find_in_set(#{user.farmId},farm_id)
</if>
</select>
--
Gitblit v1.9.3