From 60a9445e6fe2f06f966f8f4151955766c312cddd Mon Sep 17 00:00:00 2001 From: sh Date: Tue, 14 Oct 2025 09:54:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=A5=E5=BF=97=E6=97=B6Se?= =?UTF-8?q?curityUtils=E4=B8=8ESiteSecurityUtils=20=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/aspectj/BussinessLogAspect.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/BussinessLogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/BussinessLogAspect.java index 910dd9d..dfa4d01 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/BussinessLogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/BussinessLogAspect.java @@ -3,19 +3,16 @@ package com.ruoyi.framework.aspectj; import com.alibaba.fastjson2.JSON; import com.ruoyi.cms.domain.BussinessOperLog; import com.ruoyi.common.annotation.BussinessLog; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.core.domain.model.LoginSiteUser; import com.ruoyi.common.enums.BusinessStatus; import com.ruoyi.common.enums.HttpMethod; import com.ruoyi.common.filter.PropertyPreExcludeFilter; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.SiteSecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.domain.SysOperLog; import org.apache.commons.lang3.ArrayUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; @@ -88,7 +85,7 @@ public class BussinessLogAspect try { // 获取当前的用户 - LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginSiteUser loginUser = SiteSecurityUtils.getLoginUser(); // *========数据库日志=========*// BussinessOperLog operLog = new BussinessOperLog(); @@ -100,11 +97,6 @@ public class BussinessLogAspect if (loginUser != null) { operLog.setOperName(loginUser.getUsername()); - SysUser currentUser = loginUser.getUser(); - if (StringUtils.isNotNull(currentUser) && StringUtils.isNotNull(currentUser.getDept())) - { - operLog.setDeptName(currentUser.getDept().getDeptName()); - } } if (e != null)