From b45c2583b4764edb95efe9880c4abfddb8a1ec21 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 22 五月 2024 15:38:29 +0800 Subject: [PATCH] 代码提交 --- ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java | 58 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 26 deletions(-) diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java index 14f16cb..5bd88f5 100644 --- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java +++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java @@ -3,10 +3,12 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.system.api.model.LoginUser; +import com.ruoyi.system.api.model.LoginUserParent; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; +import org.springframework.util.StringUtils; import java.util.Date; @@ -36,20 +38,21 @@ public void insertFill(MetaObject metaObject) { // 获取登录信息 LoginUser loginUser = tokenService.getLoginUser(); - this.setFieldValByName("createTime", new Date(), metaObject); - this.setFieldValByName("updateTime", new Date(), metaObject); -// String userName = loginUser.getUsername(); -// if (StringUtils.hasLength(userName)) { -// this.setFieldValByName("createBy", userName, metaObject); -// this.setFieldValByName("createTime", new Date(), metaObject); -// this.setFieldValByName("updateBy", userName, metaObject); -// this.setFieldValByName("updateTime", new Date(), metaObject); -// } else { -// this.setFieldValByName("createBy", "", metaObject); -// this.setFieldValByName("updateBy", "", metaObject); -// this.setFieldValByName("createTime", "", metaObject); -// this.setFieldValByName("updateTime", "", metaObject); -// } + if (loginUser!=null){ + String userName = loginUser.getUsername(); + if (StringUtils.hasLength(userName)) { + this.setFieldValByName("createBy", userName, metaObject); + this.setFieldValByName("createTime", new Date(), metaObject); + this.setFieldValByName("updateBy", userName, metaObject); + this.setFieldValByName("updateTime", new Date(), metaObject); + } else { + this.setFieldValByName("createBy", "", metaObject); + this.setFieldValByName("updateBy", "", metaObject); + this.setFieldValByName("createTime", "", metaObject); + this.setFieldValByName("updateTime", "", metaObject); + } + } + } /** @@ -61,17 +64,20 @@ public void updateFill(MetaObject metaObject) { // 获取登录信息 LoginUser loginUser = tokenService.getLoginUser(); - String userName = loginUser.getUsername(); -// if (StringUtils.hasLength(userName)) { -// this.setFieldValByName("createBy", userName, metaObject); -// this.setFieldValByName("createTime", new Date(), metaObject); -// this.setFieldValByName("updateBy", userName, metaObject); -// this.setFieldValByName("updateTime", new Date(), metaObject); -// } else { -// this.setFieldValByName("createBy", "", metaObject); -// this.setFieldValByName("updateBy", "", metaObject); -// this.setFieldValByName("createTime", "", metaObject); -// this.setFieldValByName("updateTime", "", metaObject); -// } + if (loginUser !=null){ + String userName = loginUser.getUsername(); + if (StringUtils.hasLength(userName)) { + this.setFieldValByName("createBy", userName, metaObject); + this.setFieldValByName("createTime", new Date(), metaObject); + this.setFieldValByName("updateBy", userName, metaObject); + this.setFieldValByName("updateTime", new Date(), metaObject); + } else { + this.setFieldValByName("createBy", "", metaObject); + this.setFieldValByName("updateBy", "", metaObject); + this.setFieldValByName("createTime", "", metaObject); + this.setFieldValByName("updateTime", "", metaObject); + } + } + } } -- Gitblit v1.7.1