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

更新时间和用户注入问题

Browse Source
This commit is contained in:
抓蛙师 2021-10-20 09:40:04 +08:00
parent 60404a6564
commit ce7097b498
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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