From 5ced7e05f592ba23f585fc5a2b43ea8695ac0ff8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 28 五月 2022 22:30:06 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
index 4c4f36c..6d7c977 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
@@ -6,7 +6,7 @@
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
@@ -27,26 +27,16 @@
try {
if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
- Date current = new Date();
- // 鍒涘缓鏃堕棿涓虹┖ 鍒欏～鍏�
- if (ObjectUtil.isNull(baseEntity.getCreateTime())) {
- baseEntity.setCreateTime(current);
- }
- // 鏇存柊鏃堕棿涓虹┖ 鍒欏～鍏�
- if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
- baseEntity.setUpdateTime(current);
- }
- String username = getLoginUsername();
+ Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime())
+ ? baseEntity.getCreateTime() : new Date();
+ baseEntity.setCreateTime(current);
+ baseEntity.setUpdateTime(current);
+ String username = StringUtils.isNotBlank(baseEntity.getCreateBy())
+ ? baseEntity.getCreateBy() : getLoginUsername();
// 褰撳墠宸茬櫥褰� 涓� 鍒涘缓浜轰负绌� 鍒欏～鍏�
- if (StringUtils.isNotBlank(username)
- && StringUtils.isBlank(baseEntity.getCreateBy())) {
- baseEntity.setCreateBy(username);
- }
+ baseEntity.setCreateBy(username);
// 褰撳墠宸茬櫥褰� 涓� 鏇存柊浜轰负绌� 鍒欏～鍏�
- if (StringUtils.isNotBlank(username)
- && StringUtils.isBlank(baseEntity.getUpdateBy())) {
- baseEntity.setUpdateBy(username);
- }
+ baseEntity.setUpdateBy(username);
}
} catch (Exception e) {
throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
@@ -78,7 +68,7 @@
private String getLoginUsername() {
LoginUser loginUser;
try {
- loginUser = SecurityUtils.getLoginUser();
+ loginUser = LoginHelper.getLoginUser();
} catch (Exception e) {
log.warn("鑷姩娉ㄥ叆璀﹀憡 => 鐢ㄦ埛鏈櫥褰�");
return null;
--
Gitblit v1.9.3