diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java index ee53bfbe..bf7a535f 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java @@ -48,9 +48,15 @@ public class OauthUserInfo { /** * 账号名 */ - @ApiModelProperty(value = "账号名") + @ApiModelProperty(value = "账号信息(旧的不用了)") private List spRoleList; + /** + * 账号名 + */ + @ApiModelProperty(value = "账号信息") + private String loginName; + /** * 联系方式 */ diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java index d98a0860..95f19fc1 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java @@ -218,7 +218,7 @@ public class LoginServiceImpl implements ILoginService { } // 获取用户信息 - String userName = oauthUserInfo.getSpRoleList().get(0); + String userName = oauthUserInfo.getLoginName(); SysUser sysUser = sysUserService.getUserByName(userName); // 校验用户是否有效 @@ -251,8 +251,8 @@ public class LoginServiceImpl implements ILoginService { if (StringUtils.isNotBlank(oauthUserInfo.getErrCode())){ throw new JeroBootException(oauthUserInfo.getMsg()); } - if (Objects.isNull(oauthUserInfo.getSpRoleList()) || oauthUserInfo.getSpRoleList().isEmpty()){ - throw new JeroBootException("spRoleList返回信息为空!"); + if (StringUtils.isBlank(oauthUserInfo.getLoginName())){ + throw new JeroBootException("loginName返回信息为空!"); } return oauthUserInfo; }