学校功能

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/LoginParam.java

@@ -2,6 +2,7 @@ package com.zhongshu.card.client.model.org;
 
 import com.github.microservice.auth.client.type.DeviceType;
 import com.github.microservice.auth.client.type.LoginType;
+import com.zhongshu.card.client.utils.type.WxxcxType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -46,4 +47,7 @@ public class LoginParam {
     //刷新令牌超时时间 (秒)
     @Schema(name = "refreshTokenTimeOut", required = false, example = "31536000")
     private Long refreshTokenTimeOut;
+
+    @Schema(description = "")
+    WxxcxType wxxcxType;
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/IndexService.java

@@ -103,9 +103,11 @@ public class IndexService {
                 return ResultContent.buildFail("用户已被注销，登录失败");
             }
 
-            long orgNumber = organizationUserDao.countByUserAndState(userAccount, OrganizationState.Normal);
-            if (orgNumber <= 0) {
-                return ResultContent.buildFail("用户未加入任何机构，不能登录");
+            if (param.getLoginValue() == null) {
+                long orgNumber = organizationUserDao.countByUserAndState(userAccount, OrganizationState.Normal);
+                if (orgNumber <= 0) {
+                    return ResultContent.buildFail("用户未加入任何机构，不能登录");
+                }
             }
 
             // 记录已登录过