From 08e40b611b2bdc97361d4a6d753b788b83818623 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 05 一月 2025 23:00:56 +0800
Subject: [PATCH] fix 修复 数据权限 多角色多注解包含忽略权限标识符逻辑不正确问题
---
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
index 8463026..419dbd6 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
@@ -11,9 +11,9 @@
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
+import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.domain.model.SocialLoginBody;
-import org.dromara.common.core.enums.UserStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.StreamUtils;
@@ -121,7 +121,7 @@
if (ObjectUtil.isNull(user)) {
log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", "");
throw new UserException("user.not.exists", "");
- } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
+ } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", "");
throw new UserException("user.blocked", "");
}
--
Gitblit v1.9.3