Merge branch 'hotfix-distribute-suntg' into dev

src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -4,11 +4,7 @@ import com.uas.platform.b2b.dao.ResourceItemDao;
 import com.uas.platform.b2b.dao.RoleDao;
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.manage.service.AccessTokenService;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.ResourceItem;
-import com.uas.platform.b2b.model.Role;
-import com.uas.platform.b2b.model.SigninLog;
-import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.RoleService;
 import com.uas.platform.b2b.service.SigninLogService;
@@ -287,6 +283,8 @@ public class SSOInterceptor extends B2bAbstractSSOInterceptor {
 			return sendRedirectPersonal(request, response);
 		}
 
+		parseAuthenticationSuccess(request, response, user);
+
 		// 记录日志
 		log(request, user);
 
@@ -300,7 +298,6 @@ public class SSOInterceptor extends B2bAbstractSSOInterceptor {
 		// 进行权限验证
 		accessDecision(request, user);
 
-		parseAuthenticationSuccess(request, response, user);
 		return true;
 	}
 
@@ -428,7 +425,12 @@ public class SSOInterceptor extends B2bAbstractSSOInterceptor {
 			}
 		}
 
-		// 验证该用户是否被分配客户
+		// 验证该用户是否被分配客户，如果已经分配客户，跳过验证
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && CollectionUtils.isNotEmpty(distribute.getDistribute())) {
+			return;
+		}
+
 		if (needPermission != null) {
             throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
 		}