From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/common/config/MybatisHandler.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/config/MybatisHandler.java b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
index adfaf53..8125a35 100644
--- a/src/main/java/com/ruoyi/common/config/MybatisHandler.java
+++ b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
@@ -6,6 +6,7 @@
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
+import java.util.Optional;
@Component
public class MybatisHandler implements MetaObjectHandler {
@@ -13,15 +14,24 @@
public void insertFill(MetaObject metaObject) {
Integer userId = null;
Long tenantId = null;
+ String userName = null;
+ Long deptId = null;
try {
userId = SecurityUtils.getUserId().intValue();
tenantId = SecurityUtils.getLoginUser().getTenantId();
+ userName = SecurityUtils.getUsername();
+ deptId = SecurityUtils.getLoginUser().getCurrentDeptId();
} catch (Exception ignored) {
}
this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
this.strictInsertFill(metaObject, "createUser", Integer.class, userId);
this.strictInsertFill(metaObject, "updateUser", Integer.class, userId);
+ this.strictInsertFill(metaObject, "createUser", Long.class, userId == null ? 0 : userId.longValue());
+ this.strictInsertFill(metaObject, "updateUser", Long.class, userId == null ? 0 : userId.longValue());
+ this.strictInsertFill(metaObject, "createUserName", String.class, userName);
+ this.strictInsertFill(metaObject, "updateUserName", String.class, userName);
+ this.strictInsertFill(metaObject, "deptId", Long.class, deptId);
this.strictInsertFill(metaObject, "tenantId", Long.class, tenantId);
}
--
Gitblit v1.9.3