From 22cb0ddec260bb5c5868543e8fe27d67625e8951 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 11:34:14 +0800
Subject: [PATCH] feat(menu): 更新安全数据驾驶舱菜单挂载位置并完善库存记录字段
---
src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index 45d3bfe..850c12f 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -2,8 +2,8 @@
import java.util.Collection;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.ArrayUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
@@ -98,8 +98,10 @@
operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
if (loginUser != null)
{
- operLog.setOperName(loginUser.getUsername());
SysUser currentUser = loginUser.getUser();
+ // 鎿嶄綔浜哄憳璁板綍鏄电О锛屾樀绉颁负绌烘椂鍥為��鐧诲綍璐﹀彿
+ operLog.setOperName(StringUtils.isNotNull(currentUser) && StringUtils.isNotEmpty(currentUser.getNickName())
+ ? currentUser.getNickName() : loginUser.getUsername());
if (StringUtils.isNotNull(currentUser) && StringUtils.isNotNull(currentUser.getDept()))
{
operLog.setDeptName(currentUser.getDept().getDeptName());
--
Gitblit v1.9.3