From fb614b7b54591edb1ab1cc4cc3b1fcd2d6d9262b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 六月 2024 15:27:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/config/DataUpdateHandlerConfig.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/config/DataUpdateHandlerConfig.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/config/DataUpdateHandlerConfig.java
index bf136fb..0a690eb 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/config/DataUpdateHandlerConfig.java
@@ -37,18 +37,23 @@
public void insertFill(MetaObject metaObject) {
// 获取登录信息
LoginUser loginUser = tokenService.getLoginUser();
- String userName = loginUser.getUsername();
- if (StringUtils.hasLength(userName)) {
- this.setFieldValByName("createBy", userName, 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("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);
}
+
}
/**
--
Gitblit v1.7.1