From 528d3d8cacc28eccca68a7194f64e451b7ef7d3b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 七月 2024 17:43:31 +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 | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 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 a40933b..22106c6 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
@@ -55,6 +55,12 @@
this.setFieldValByName("createTime", new Date(), metaObject);
this.setFieldValByName("updateTime", new Date(), metaObject);
}
+ LoginUserParent loginUser1 = tokenService.getLoginUserStudy();
+ if (loginUser1 != null) {
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ } else {
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ }
}
@@ -63,26 +69,26 @@
*/
@Override
public void updateFill(MetaObject metaObject) {
- // 获取登录信息
- LoginUserParent userStudy = tokenService.getLoginUserStudy();
- if (userStudy != null) {
- String userName = userStudy.getName();
- 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);
- }
+// // 获取登录信息
+// LoginUserParent userStudy = tokenService.getLoginUserStudy();
+// if (userStudy != null) {
+// String userName = userStudy.getName();
+// 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