增加用户部门和职位

xieb

2023-12-18 b79e77c9b57a1358d7fa94ad536adf1dbddc904c

增加用户部门和职位

 src/main/java/org/springblade/modules/auth/granter/PasswordTokenGranter.java

@@ -19,6 +19,7 @@
import lombok.AllArgsConstructor;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.utils.DigestUtil;
@@ -105,6 +106,8 @@
        if (Func.isNotEmpty(headerDept) && userInfo != null && userInfo.getUser().getDeptId().contains(headerDept)) {
            userInfo.getUser().setDeptId(headerDept);
        }
        userInfo.setDeptName(SysCache.getDeptName(Long.valueOf(userInfo.getUser().getDeptId())));
        userInfo.setPostName(SysCache.getPostName(Long.valueOf(userInfo.getUser().getPostId())));
        // 多角色情况下指定单角色
        if (Func.isNotEmpty(headerRole) && userInfo != null && userInfo.getUser().getRoleId().contains(headerRole)) {
            List<String> roleAliases = roleService.getRoleAliases(headerRole);

 src/main/java/org/springblade/modules/auth/granter/SmsCodeTokenGranter.java

@@ -3,6 +3,7 @@
import lombok.AllArgsConstructor;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.utils.DigestUtil;
@@ -98,6 +99,8 @@
        if (Func.isNotEmpty(headerDept) && userInfo != null && userInfo.getUser().getDeptId().contains(headerDept)) {
            userInfo.getUser().setDeptId(headerDept);
        }
        userInfo.setDeptName(SysCache.getDeptName(Long.valueOf(userInfo.getUser().getDeptId())));
        userInfo.setPostName(SysCache.getPostName(Long.valueOf(userInfo.getUser().getPostId())));
        // 多角色情况下指定单角色
        if (Func.isNotEmpty(headerRole) && userInfo != null && userInfo.getUser().getRoleId().contains(headerRole)) {
            List<String> roleResult = roleService.getRoleAliases(headerRole);

 src/main/java/org/springblade/modules/auth/utils/TokenUtil.java

@@ -121,7 +121,9 @@
                .set(TokenConstant.TOKEN_TYPE, TokenConstant.BEARER)
                .set(TokenConstant.EXPIRES_IN, accessToken.getExpire())
                .set(TokenConstant.DETAIL, userInfo.getDetail())
                .set(TokenConstant.LICENSE, TokenConstant.LICENSE_NAME);
                .set(TokenConstant.LICENSE, TokenConstant.LICENSE_NAME)
                .set("dept_name", userInfo.getDeptName())
                .set("post_name", userInfo.getPostName());
        } catch (Exception ex) {
            return authInfo.set("error_code", HttpServletResponse.SC_UNAUTHORIZED).set("error_description", ex.getMessage());
        }

 src/main/java/org/springblade/modules/system/entity/UserInfo.java

@@ -41,6 +41,10 @@
    @ApiModelProperty(value = "用户")
    private User user;

    private String deptName;

    private String postName;

    /**
     * 拓展信息
     */