From e3f15c4a394310bc657c6ab77dfa94852e13392c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sun, 4 Feb 2024 09:44:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20LoginUser.java=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=AE=A1=E7=90=86=E5=91=98=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/common/system/vo/LoginUser.java | 5 +++++ .../jero/modules/system/service/impl/SysBaseApiImpl.java | 9 +++++++-- .../src/main/resources/application-dev.yml | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java index 6f82283e..5ec25aea 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java @@ -122,4 +122,9 @@ public class LoginUser { return this.realname + "(" + this.username + ")"; } + /** + * 根据配置文件中的adminRoleCode判断 + */ + private Boolean isAdmin; + } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java index 421c0b59..eea285b8 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.system.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -40,6 +41,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.util.AntPathMatcher; @@ -105,7 +107,8 @@ public class SysBaseApiImpl implements ISysBaseAPI { private ISysDictItemService sysDictItemService; @Autowired private CommonAPI commonAPI; - + @Value("${adminRoleCode}") + private String adminRoleCode; @Autowired ISysCategoryService sysCategoryService; private static final String ERROR_MSG = "消息模板不存在，模板编码："; @@ -128,7 +131,9 @@ public class SysBaseApiImpl implements ISysBaseAPI { // 添加用户角色 Set roleSet = commonAPI.queryUserRoles(loginUser.getUsername()); loginUser.setRoleIds(StringUtils.join(roleSet, ",")); - + List adminRoleCodeList = Arrays.asList(adminRoleCode.split(",")); + // 添加是否管理员 + loginUser.setIsAdmin(CollectionUtil.containsAny(roleSet, adminRoleCodeList)); return loginUser; } diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index c88aed33..290a7110 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -439,7 +439,7 @@ oauth: draftDepartName: 起草部门 # 管理员权限roleCode,多填用英文逗号拼接 -adminRoleCode: admin +adminRoleCode: admin,BZGLY # 文件下载加解密 download: