From 5d45e3e603ad025c9314b3dedd1541723ea00ecb Mon Sep 17 00:00:00 2001
From: smallbun <2689170096@qq.com>
Date: Wed, 8 Feb 2023 14:44:26 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/topiam/employee/core/security/task/UserUnlockTask.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eiam-core/src/main/java/cn/topiam/employee/core/security/task/UserUnlockTask.java b/eiam-core/src/main/java/cn/topiam/employee/core/security/task/UserUnlockTask.java
index 33920f8b..98aa23ff 100644
--- a/eiam-core/src/main/java/cn/topiam/employee/core/security/task/UserUnlockTask.java
+++ b/eiam-core/src/main/java/cn/topiam/employee/core/security/task/UserUnlockTask.java
@@ -55,7 +55,8 @@ public class UserUnlockTask {
     public void execute() {
         logger.info("用户自动解锁任务开始");
         QUserEntity qUserEntity = QUserEntity.userEntity;
-        Predicate predicate = qUserEntity.isNotNull();
+        Predicate predicate = ExpressionUtils.and(qUserEntity.isNotNull(),
+            qUserEntity.isDeleted.eq(Boolean.FALSE));
         //查询条件
         //@formatter:off
         predicate = ExpressionUtils.and(predicate, qUserEntity.status.eq(UserStatus.LOCKED));