add datanum

nb-service/web-service/src/main/java/com/nb/web/service/system/auth/DefaultAccountOperator.java

@@ -51,24 +51,27 @@ public class DefaultAccountOperator implements IAccountOperator {
     @Override
     public UserInfoVO getUserInfo() {
         UserInfoVO userInfoVO = new UserInfoVO();
-        SysUser sysUser = sysUserService.getById(SecurityUtil.getStpLogic().getLoginIdAsLong());
-        // 查询角色列表
-        List<SysRole> sysRoleList = sysRoleService.listSysRoleByUserId(sysUser.getId());
-        List<RoleInfoVO> roleInfoVOList = sysRoleList.stream().map(item -> {
-            RoleInfoVO roleInfoVO = new RoleInfoVO();
-            roleInfoVO.setRoleName(item.getRoleName());
-            roleInfoVO.setValue(item.getRoleCode());
-            return roleInfoVO;
-        }).collect(Collectors.toList());
-        userInfoVO.setUserId(sysUser.getId().toString());
-        userInfoVO.setUsername(sysUser.getAccount());
-        userInfoVO.setRealName(sysUser.getNickname());
-        userInfoVO.setAvatar(sysUser.getAvatar());
-        userInfoVO.setDesc(sysUser.getRemarks());
-        userInfoVO.setRoles(roleInfoVOList);
-        userInfoVO.setIsSys(sysUser.getIsSys());
-        userInfoVO.setTenantId(String.valueOf(sysUser.getTenantId()));
-        userInfoVO.setTenantName(sysUser.getTenantName());
+        LoginUser<String> loginUser = SecurityUtil.getLoginUser();
+        if(GrantTypeEnum.WEB_USERNAME_PASSWORD.equals(loginUser.getGrantType())){
+            SysUser sysUser = sysUserService.getById(SecurityUtil.getStpLogic().getLoginIdAsLong());
+            // 查询角色列表
+            List<SysRole> sysRoleList = sysRoleService.listSysRoleByUserId(sysUser.getId());
+            List<RoleInfoVO> roleInfoVOList = sysRoleList.stream().map(item -> {
+                RoleInfoVO roleInfoVO = new RoleInfoVO();
+                roleInfoVO.setRoleName(item.getRoleName());
+                roleInfoVO.setValue(item.getRoleCode());
+                return roleInfoVO;
+            }).collect(Collectors.toList());
+            userInfoVO.setUserId(sysUser.getId().toString());
+            userInfoVO.setUsername(sysUser.getAccount());
+            userInfoVO.setRealName(sysUser.getNickname());
+            userInfoVO.setAvatar(sysUser.getAvatar());
+            userInfoVO.setDesc(sysUser.getRemarks());
+            userInfoVO.setRoles(roleInfoVOList);
+            userInfoVO.setIsSys(sysUser.getIsSys());
+            userInfoVO.setTenantName(sysUser.getTenantName());
+        }
+        userInfoVO.setTenantId(loginUser.getTenantId());
         return userInfoVO;
     }