From ce7097b49875c6b51739c64a72ba0f2339db20c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Wed, 20 Oct 2021 09:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E5=92=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateAndUpdateMetaObjectHandler.java     | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 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 d662ae9fa..7cf64c46b 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
@@ -42,7 +42,7 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
 						&& StringUtils.isBlank(baseEntity.getCreateBy())) {
 					baseEntity.setCreateBy(username);
 				}
-				// 当前已登录 且 更信任为空 则填充
+				// 当前已登录 且 更新人为空 则填充
 				if (StringUtils.isNotBlank(username)
 						&& StringUtils.isBlank(baseEntity.getUpdateBy())) {
 					baseEntity.setUpdateBy(username);
@@ -59,16 +59,13 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
 			if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
 				BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
 				Date current = new Date();
-				// 更新时间为空 则填充
-				if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
-					baseEntity.setUpdateTime(current);
-				}
-				String username = getLoginUsername();
-				// 当前已登录 且 更信任为空 则填充
-				if (StringUtils.isNotBlank(username)
-						&& StringUtils.isBlank(baseEntity.getUpdateBy())) {
-					baseEntity.setUpdateBy(username);
-				}
+                // 更新时间填充(不管为不为空)
+                baseEntity.setUpdateTime(current);
+                String username = getLoginUsername();
+                // 当前已登录 更新人填充(不管为不为空)
+                if (StringUtils.isNotBlank(username)) {
+                    baseEntity.setUpdateBy(username);
+                }
 			}
 		} catch (Exception e) {
 			throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);