From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
index 4ec9510..16cddbe 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
@@ -2,11 +2,12 @@
import com.alibaba.fastjson.JSON;
import com.ruoyi.account.api.model.AppUser;
-import com.ruoyi.account.service.IAppUserService;
+import com.ruoyi.account.service.AppUserService;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import org.apache.logging.log4j.core.config.Order;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +35,7 @@
@Lazy
@Resource
- private IAppUserService appUserService;
+ private AppUserService appUserService;
@Lazy
@Resource
@@ -73,7 +74,7 @@
//小程序用户
if ("applet".equals(userType)) {
AppUser appUser = appUserService.getById(userid);
- if(null == appUser || appUser.getDelFlag() == 1 || 3 == appUser.getStatus()){
+ if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
log.error("[账户异常处理]请求账户id:{}", userid);
unauthorizedResponse(response,"无效的账户");
return;
--
Gitblit v1.7.1