From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/common/config/MybatisHandler.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/config/MybatisHandler.java b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
index 71d9b56..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,16 +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) {
}
- System.out.println("鎵ц鎻掑叆濉厖...");
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);
}
@@ -36,4 +45,4 @@
this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // 璧峰鐗堟湰 3.3.0(鎺ㄨ崘)
this.strictUpdateFill(metaObject, "updateUser", Integer.class, userId);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3