admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!101 更新时间和用户注入问题

Browse Source 
Merge pull request !101 from 抓蛙师/auto-7465549-dev-1634694016583
This commit is contained in:
疯狂的狮子Li 2021-10-20 01:41:24 +00:00 committed by Gitee
commit 8b6f7b4e4c
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
View File

@ -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);
}
}