Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/Controllers/Third/Xkw/XkwOAuth2Controller.cs

@@ -165,7 +165,8 @@ namespace TEAMModelOS.Controllers
                 string errorMsg = "学科网"+client.ErrorMessage;
                 return Redirect($"bind?status=0&accessToken={client.AccessToken}&openId={client.OpenId}&userId={client.UserId}&msg={HttpUtility.UrlEncode(errorMsg)}");
             }
-            if (client.IsAuthorized)
+
+            if (client.IsAuthorized || !string.IsNullOrWhiteSpace(client.OpenId))
             {
                 return Redirect($"bind?status=1&accessToken={client.AccessToken}&openId={client.OpenId}&userId={client.UserId}&msg={HttpUtility.UrlEncode("认证成功")}");
             }