From 0b40724a8fddecb66d86af9e0d63e090d0443ee0 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Mon, 21 Apr 2025 16:34:22 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E5=90=8C=E7=BA=A7=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=202=E3=80=81=E5=BC=80=E5=8F=91app=E9=A6=96=E9=A1=B5=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BusinessAlertStatisticsServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java index 3fae449..113719e 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java @@ -18,6 +18,8 @@ import org.dromara.system.api.RemotePostService; import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo; import org.dromara.system.api.domain.vo.RemoteDeptVo; import org.dromara.system.api.domain.vo.RemotePostVo; +import org.dromara.system.api.model.LoginUser; +import org.dromara.system.api.model.RoleDTO; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -739,7 +741,14 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist } private void createPermissions(BusinessAlertBo businessAlertBo) { - String roleCustom = remoteDataScopeService.getRoleCustom(LoginHelper.getLoginUser().getRoles().getFirst().getRoleId()); + Long roleId = Optional.ofNullable(LoginHelper.getLoginUser()) + .map(LoginUser::getRoles) + .filter(roles -> !roles.isEmpty()) + .map(List::getFirst) + .map(RoleDTO::getRoleId) + .orElse(null); + + String roleCustom = remoteDataScopeService.getRoleCustom(roleId); if (roleCustom.equalsIgnoreCase("-1")){ businessAlertBo.setDeptIdList(ListUtil.empty()); }else {