From 4184b9dc0f69b28fb0e8f330e1cdb633d6f3ebd4 Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Mon, 10 Jan 2022 13:16:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DtokenService.getLoginUser()?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9ELoginUser=E4=B8=AD=E7=9A=84userType=E4=B8=BAn?=
 =?UTF-8?q?ull=E7=9A=84=E9=97=AE=E9=A2=98=20by=20yy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/system/controller/SysUserController.java   | 5 +++++
 .../src/main/resources/mapper/system/SysUserMapper.xml       | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java
index b001f44c..6430a50e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java
@@ -11,6 +11,7 @@ import com.xhpc.common.core.web.page.TableDataInfo;
 import com.xhpc.common.log.annotation.Log;
 import com.xhpc.common.log.enums.BusinessType;
 import com.xhpc.common.security.annotation.PreAuthorize;
+import com.xhpc.common.util.UserTypeUtil;
 import com.xhpc.system.api.domain.SysRole;
 import com.xhpc.system.api.domain.SysUser;
 import com.xhpc.system.api.model.LoginUser;
@@ -107,6 +108,10 @@ public class SysUserController extends BaseController {
         sysUserVo.setTenantId(sysUser.getTenantId());
         sysUserVo.setRoles(roles);
         sysUserVo.setPermissions(permissions);
+        sysUserVo.setUsername(username);
+        sysUserVo.setUserType(UserTypeUtil.USER_TYPE);
+        sysUserVo.setUserTypeUtil(UserTypeUtil.USER);
+        sysUserVo.setUserid(sysUser.getUserId());
         return R.ok(sysUserVo);
     }
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 8e553c57..679b6328 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -27,6 +27,7 @@
         <result column="update_by" property="updateBy"/>
         <result column="update_time" property="updateTime"/>
         <result column="remark" property="remark"/>
+        <result column="tenant_id" property="tenantId"/>
         <result column="operator_id" property="operatorId"/>
         <association column="dept_id" property="dept" javaType="com.xhpc.system.api.domain.SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>