From 18ffbcaf17890468de0196338e9ba0b66711c52c Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 8 Apr 2020 12:19:08 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/system/user/cache/UserCache.java | 12 +++---------
 .../system/user/service/impl/UserServiceImpl.java    |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java
index 420f1a6d..0504eb1e 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java
@@ -78,16 +78,10 @@ public class UserCache {
 	 * @return
 	 */
 	public static User getUser(String tenantId, String account) {
-		User userCache = CacheUtil.get(USER_CACHE, USER_CACHE_ACCOUNT, tenantId + StringPool.DASH + account, User.class);
-		if (userCache == null || userCache.getId() == null) {
+		return CacheUtil.get(USER_CACHE, USER_CACHE_ACCOUNT, tenantId + StringPool.DASH + account, () -> {
 			R<User> result = getUserClient().userByAccount(tenantId, account);
-			User user = result.getData();
-			if (user != null && user.getId() != null) {
-				CacheUtil.put(USER_CACHE, USER_CACHE_ACCOUNT, tenantId + StringPool.DASH + account, user);
-				return user;
-			}
-		}
-		return userCache;
+			return result.getData();
+		});
 	}
 
 }
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index c81a7f87..e4bc4158 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -129,7 +129,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 	@Override
 	public User userByAccount(String tenantId, String account) {
-		return baseMapper.selectOne(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, account));
+		return baseMapper.selectOne(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, account).eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED));
 	}
 
 	@Override