From 2297c50a14f92dd869edae212d4aabe8f0bf0572 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 25 Apr 2021 21:21:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 71dbaea..7c7f9ae 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -100,6 +100,9 @@
         <if test="user.account!=null and user.account != ''">
             and s.account = #{user.account}
         </if>
+        <if test="user.id!=null and user.id != ''">
+            and s.id = #{user.id}
+        </if>
         <if test="user.realName!=null and user.realName != ''">
             and s.real_name = #{user.realName}
         </if>

--
Gitblit v1.9.3