From 497df0adf57c8a076596fa763cdbe5a554b96b5b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 25 Dec 2021 18:39:46 +0800
Subject: [PATCH] 新增分公司的总公司工商信息管理

---
 src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
index 5be3e0a..97a418d 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -88,11 +88,14 @@
 		ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
 		UserInfo userInfo = granter.grant(tokenParameter);
 
-		if (userInfo == null || userInfo.getUser() == null && s.equals("0")) {
-			return authInfo.set("error_description", "用户未审核");
-		}
-		if (userInfo == null || userInfo.getUser() == null && s.equals("2")) {
-			return authInfo.set("error_description", "审核不通过");
+
+		if (null!=s && s.equals("")) {
+			if (s.equals("0")) {
+				return authInfo.set("error_description", "用户未审核");
+			}
+			if (s.equals("2")) {
+				return authInfo.set("error_description", "审核不通过");
+			}
 		}
 		if (userInfo == null || userInfo.getUser() == null ) {
 			return authInfo.set("error_code", HttpServletResponse.SC_BAD_REQUEST).set("error_description", "用户名或密码不正确");

--
Gitblit v1.9.3