From 75942ecc2e438012c5ea876715966ace593565a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 15:17:41 +0800
Subject: [PATCH] 部分代码

---
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java |   66 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 28 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..fdfcadd 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;
 
@@ -29,49 +31,57 @@
 
     /**
      * 新增数据执行
-     *
-     * @param metaObject
      */
     @Override
     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);
+            }
+        } else {
+            this.setFieldValByName("createBy", "", metaObject);
+            this.setFieldValByName("updateBy", "", metaObject);
+            this.setFieldValByName("createTime", new Date(), metaObject);
+            this.setFieldValByName("updateTime", new Date(), metaObject);
+        }
     }
 
     /**
      * 修改数据执行
-     *
-     * @param metaObject
      */
     @Override
     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);
+//        //  获取登录信息
+//        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);
+//                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);
+//            }
 //        } else {
 //            this.setFieldValByName("createBy", "", metaObject);
 //            this.setFieldValByName("updateBy", "", metaObject);
-//            this.setFieldValByName("createTime", "", metaObject);
-//            this.setFieldValByName("updateTime", "", metaObject);
+//            this.setFieldValByName("createTime", new Date(), metaObject);
+//            this.setFieldValByName("updateTime", new Date(), metaObject);
 //        }
     }
 }

--
Gitblit v1.7.1