From 82d0f09da0e5f58b3bbaeafdd3d4bf00cbde73d7 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 五月 2024 09:04:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java | 66 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java
index 23e4d89..6e003ba 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java
@@ -7,6 +7,9 @@
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
/**
* @author xiaochen
@@ -34,18 +37,26 @@
public void insertFill(MetaObject metaObject) {
// 获取登录信息
LoginUser loginUser = tokenService.getLoginUser();
- String userName = loginUser.getUsername();
-// if (StringUtils.hasLength(userName)) {
-// this.setFieldValByName("createBy", userName, metaObject);
-// this.setFieldValByName("createTime", new Date(), metaObject);
-// this.setFieldValByName("updateBy", userName, metaObject);
-// this.setFieldValByName("updateTime", new Date(), metaObject);
-// } else {
-// this.setFieldValByName("createBy", "", metaObject);
-// this.setFieldValByName("updateBy", "", metaObject);
-// this.setFieldValByName("createTime", "", metaObject);
-// this.setFieldValByName("updateTime", "", metaObject);
-// }
+ if (loginUser != null) {
+ String userName = loginUser.getUsername();
+ if (StringUtils.hasLength(userName)) {
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ } else {
+ this.setFieldValByName("createBy", "", metaObject);
+ this.setFieldValByName("updateBy", "", metaObject);
+ this.setFieldValByName("createTime", "", metaObject);
+ this.setFieldValByName("updateTime", "", metaObject);
+ }
+ } else {
+ this.setFieldValByName("createBy", "", metaObject);
+ this.setFieldValByName("updateBy", "", metaObject);
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ }
+
}
/**
@@ -57,17 +68,24 @@
public void updateFill(MetaObject metaObject) {
// 获取登录信息
LoginUser loginUser = tokenService.getLoginUser();
- String userName = loginUser.getUsername();
-// if (StringUtils.hasLength(userName)) {
-// this.setFieldValByName("createBy", userName, metaObject);
-// this.setFieldValByName("createTime", new Date(), metaObject);
-// this.setFieldValByName("updateBy", userName, metaObject);
-// this.setFieldValByName("updateTime", new Date(), metaObject);
-// } else {
-// this.setFieldValByName("createBy", "", metaObject);
-// this.setFieldValByName("updateBy", "", metaObject);
-// this.setFieldValByName("createTime", "", metaObject);
-// this.setFieldValByName("updateTime", "", metaObject);
-// }
+ if (loginUser != null) {
+ String userName = loginUser.getUsername();
+ if (StringUtils.hasLength(userName)) {
+ this.setFieldValByName("createBy", userName, metaObject);
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("updateBy", userName, metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ } else {
+ this.setFieldValByName("createBy", "", metaObject);
+ this.setFieldValByName("updateBy", "", metaObject);
+ this.setFieldValByName("createTime", "", metaObject);
+ this.setFieldValByName("updateTime", "", metaObject);
+ }
+ } else {
+ this.setFieldValByName("createBy", "", metaObject);
+ this.setFieldValByName("updateBy", "", metaObject);
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ }
}
}
--
Gitblit v1.7.1