From a840ef6aa8f89075cbaee87973cdece12e370a28 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 三月 2026 19:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/system/entity/OperateLog.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/OperateLog.java b/src/main/java/com/zy/system/entity/OperateLog.java
index 726ef71..df81694 100644
--- a/src/main/java/com/zy/system/entity/OperateLog.java
+++ b/src/main/java/com/zy/system/entity/OperateLog.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -16,6 +17,7 @@
public class OperateLog implements Serializable {
private static final long serialVersionUID = 1L;
+ private static final Long SUPER_USER_ID = 9527L;
/**
* 缂栧彿
@@ -52,6 +54,7 @@
/**
* 娣诲姞鏃堕棿
*/
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField("create_time")
private Date createTime;
@@ -76,6 +79,9 @@
}
public String getUserId$(){
+ if (SUPER_USER_ID.equals(this.userId)) {
+ return "super";
+ }
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.userId);
if (!Cools.isEmpty(user)){
--
Gitblit v1.9.1