From 610604ea8fbdc1f2b0f54e90a689b9ff449f092c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 六月 2024 15:48:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 6e003ba..a40933b 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,6 +3,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.LoginUserParent;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +31,6 @@
/**
* 新增数据执行
- *
- * @param metaObject
*/
@Override
public void insertFill(MetaObject metaObject) {
@@ -61,15 +60,13 @@
/**
* 修改数据执行
- *
- * @param metaObject
*/
@Override
public void updateFill(MetaObject metaObject) {
// 获取登录信息
- LoginUser loginUser = tokenService.getLoginUser();
- if (loginUser != null) {
- String userName = loginUser.getUsername();
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (userStudy != null) {
+ String userName = userStudy.getName();
if (StringUtils.hasLength(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
this.setFieldValByName("createTime", new Date(), metaObject);
--
Gitblit v1.7.1