切换学校客户端登录修改

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/LoginClientResult.java

@@ -8,10 +8,12 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.AppSourceEnum;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -88,11 +90,14 @@ public class LoginClientResult implements Serializable {
         this.roleList = loginResult.getRoleList();
         this.appSource = loginResult.getAppSource();
         this.pwdCount = sysUser.getPwdCount();
-        this.roleSource = loginResult.getRoleSource();
-        LoginResult.SchoolNativeBean schoolNativeBean = loginResult.getSchoolInfo().get(0);
-        this.schoolInfo = new SchoolNativeBean(schoolNativeBean.getId(), schoolNativeBean.getCode(), schoolNativeBean.getName());
-        LoginResult.OrgNativeBean orgNativeBean = loginResult.getOrgInfo();
-        this.orgInfo = new OrgNativeBean(orgNativeBean.getId(), orgNativeBean.getCode(), orgNativeBean.getName());
+        if (!CollectionUtils.isEmpty(loginResult.getSchoolInfo())) {
+            LoginResult.SchoolNativeBean schoolNativeBean = loginResult.getSchoolInfo().get(0);
+            this.schoolInfo = new SchoolNativeBean(schoolNativeBean.getId(), schoolNativeBean.getCode(), schoolNativeBean.getName());
+        }
+        if (Objects.nonNull(loginResult.getOrgInfo())) {
+            LoginResult.OrgNativeBean orgNativeBean = loginResult.getOrgInfo();
+            this.orgInfo = new OrgNativeBean(orgNativeBean.getId(), orgNativeBean.getCode(), orgNativeBean.getName());
+        }
         this.time = loginResult.getTime();
         this.userLoginCheckResult = loginResult.getUserLoginCheckResult();
         this.returnUrl = loginResult.returnUrl;