From 94ae02e6f73b7011f0fcf6acff8636341d35351d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 17:24:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/config/MyDateObjectHandler.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/config/MyDateObjectHandler.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/config/MyDateObjectHandler.java
index 6444df6..c8c363a 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/config/MyDateObjectHandler.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/config/MyDateObjectHandler.java
@@ -2,7 +2,7 @@
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.LoginUserInfo;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
@@ -26,8 +26,8 @@
*/
@Override
public void insertFill(MetaObject metaObject) {
- LoginUser loginUser = tokenService.getLoginUserByUser();
- String userName = null == loginUser ? "" : loginUser.getUsername();
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
+ String userName = null == loginUser ? "" : loginUser.getName();
// 创建时间
this.setFieldValByName("createTime", new Date(), metaObject);
// 更新时间
@@ -42,8 +42,8 @@
@Override
public void updateFill(MetaObject metaObject) {
- LoginUser loginUser = tokenService.getLoginUserByUser();
- String userName = null == loginUser ? "" : loginUser.getUsername();
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
+ String userName = null == loginUser ? "" : loginUser.getName();
// 修改时间为当前时间
this.setFieldValByName("updateTime", new Date(), metaObject);
this.setFieldValByName("updateBy", userName, metaObject);
--
Gitblit v1.7.1