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..dbbb1f40c 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,14 +59,11 @@ 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())) { + // 当前已登录 更新人填充(不管为不为空) + if (StringUtils.isNotBlank(username)) { baseEntity.setUpdateBy(username); } }