yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复tokenService.getLoginUser()返回LoginUser中的userType为null的问题 by yy

Browse Source
This commit is contained in:
wen 2022-01-10 13:16:35 +08:00
parent 4941d32b89
commit 4184b9dc0f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java
View File

@ -11,6 +11,7 @@ import com.xhpc.common.core.web.page.TableDataInfo;
import com.xhpc.common.log.annotation.Log; import com.xhpc.common.log.annotation.Log;
import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.log.enums.BusinessType;
import com.xhpc.common.security.annotation.PreAuthorize; 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.SysRole;
import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.domain.SysUser;
import com.xhpc.system.api.model.LoginUser; import com.xhpc.system.api.model.LoginUser;
@ -107,6 +108,10 @@ public class SysUserController extends BaseController {
sysUserVo.setTenantId(sysUser.getTenantId()); sysUserVo.setTenantId(sysUser.getTenantId());
sysUserVo.setRoles(roles); sysUserVo.setRoles(roles);
sysUserVo.setPermissions(permissions); sysUserVo.setPermissions(permissions);
sysUserVo.setUsername(username);
sysUserVo.setUserType(UserTypeUtil.USER_TYPE);
sysUserVo.setUserTypeUtil(UserTypeUtil.USER);
sysUserVo.setUserid(sysUser.getUserId());
return R.ok(sysUserVo); return R.ok(sysUserVo);
} }

1
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -27,6 +27,7 @@
<result column="update_by" property="updateBy"/> <result column="update_by" property="updateBy"/>
<result column="update_time" property="updateTime"/> <result column="update_time" property="updateTime"/>
<result column="remark" property="remark"/> <result column="remark" property="remark"/>
<result column="tenant_id" property="tenantId"/>
<result column="operator_id" property="operatorId"/> <result column="operator_id" property="operatorId"/>
<association column="dept_id" property="dept" javaType="com.xhpc.system.api.domain.SysDept" resultMap="deptResult"/> <association column="dept_id" property="dept" javaType="com.xhpc.system.api.domain.SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/> <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>