From 3fdf536800e9c767dfab1f6d53b91486297b2d13 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 3 Nov 2023 14:31:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(iam):=20=E5=8D=95=E7=82=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/system/entity/OauthUserInfo.java     | 8 +++++++-
 .../modules/system/service/impl/LoginServiceImpl.java     | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

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<String> 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;
     }