!101 更新时间和用户注入问题 Merge pull request !101 from 抓蛙师/auto-7465549-dev-16346940...

疯狂的狮子Li

2021-10-20 8b6f7b4e4ca9bb976597ed129a6c0e45a02863ec

!101 更新时间和用户注入问题
Merge pull request !101 from 抓蛙师/auto-7465549-dev-1634694016583

 ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java

@@ -42,7 +42,7 @@
                        && StringUtils.isBlank(baseEntity.getCreateBy())) {
                    baseEntity.setCreateBy(username);
                }
                // 当前已登录 且 更信任为空 则填充
                // 当前已登录 且 更新人为空 则填充
                if (StringUtils.isNotBlank(username)
                        && StringUtils.isBlank(baseEntity.getUpdateBy())) {
                    baseEntity.setUpdateBy(username);
@@ -59,16 +59,13 @@
            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);