From 01dc732d940e81b954685705c32a129473eed951 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 02 七月 2024 10:56:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java
index 972a4cc..33b9a89 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java
@@ -40,7 +40,7 @@
LoginUser loginUser = tokenService.getLoginUser();
this.setFieldValByName("createTime", new Date(), metaObject);
this.setFieldValByName("updateTime", new Date(), metaObject);
- if (loginUser!=null){
+ if (loginUser != null) {
String userName = loginUser.getUsername();
if (StringUtils.hasLength(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
@@ -66,17 +66,44 @@
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);
+ }
+ return;
}
+// LoginUserParent loginUser1 = tokenService.getLoginUser1();
+// if (loginUser1!=null){
+// String userName = loginUser1.getName();
+// if (StringUtils.hasLength(userName)) {
+// this.setFieldValByName("updateBy", userName, metaObject);
+// this.setFieldValByName("updateTime", new Date(), metaObject);
+// } else {
+// this.setFieldValByName("createTime", "", metaObject);
+// this.setFieldValByName("updateTime", "", metaObject);
+// }
+// return;
+// }
+// LoginUserParent loginUser2 = tokenService.getLoginUserStudy();
+// if (loginUser2!=null){
+// String userName = loginUser2.getName();
+// if (StringUtils.hasLength(userName)) {
+// this.setFieldValByName("updateBy", userName, metaObject);
+// this.setFieldValByName("updateTime", new Date(), metaObject);
+// } else {
+// this.setFieldValByName("createTime", "", metaObject);
+// this.setFieldValByName("updateTime", "", metaObject);
+// }
+// }
+
}
}
--
Gitblit v1.7.1