From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java b/zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java
index e1e5bb3..9603548 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java
@@ -33,10 +33,11 @@
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
- String requestUrl = request.getRequestURI();
+ String requestUrl = request.getRequestURI();
// 如果访问特殊的路径需要验证管理员的登录权限
if (requestUrl.indexOf(ADMIN) != -1 || requestUrl.indexOf(SUPER) != -1
|| requestUrl.indexOf(DEVELOPER) != -1 || requestUrl.indexOf(CUSTOMER) != -1) {
+
if (WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY) == null) {
// 判断是否为异步请求
String requestType = request.getHeader(X_REQUESTED_WITH);
--
Gitblit v1.9.1