From 6f97a42dccaedb7a8950feac205080e63d8be439 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 二月 2025 14:27:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
similarity index 68%
rename from ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
index 7b7dba6..e5836a2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
@@ -1,6 +1,8 @@
-package com.ruoyi.common.config;
+package com.ruoyi.web.core.config;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.context.annotation.Configuration;
@@ -27,14 +29,15 @@
@Override
public void insertFill(MetaObject metaObject) {
// 获取登录信息
- /* String userName = JwtTokenUtils.getUsername();
+ String userName = SecurityUtils.getUsername();
if (StringUtils.isNotBlank(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
this.setFieldValByName("updateBy", userName, metaObject);
} else {
- this.setFieldValByName("createBy", "", metaObject);
- this.setFieldValByName("updateBy", "", metaObject);
- }*/
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ }
+
}
/**
@@ -45,13 +48,14 @@
@Override
public void updateFill(MetaObject metaObject) {
// 获取登录信息
- /*String userName = JwtTokenUtils.getUsername();
- if (StringUtils.isNotBlank(userName)) {
+ String userName = SecurityUtils.getUsername();
+ if (StringUtils.isNotBlank(userName)){
this.setFieldValByName("createBy", userName, metaObject);
this.setFieldValByName("updateBy", userName, metaObject);
} else {
- this.setFieldValByName("createBy", "", metaObject);
- this.setFieldValByName("updateBy", "", metaObject);
- }*/
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ }
+
}
}
--
Gitblit v1.7.1