From 2eee3f3af2ad8d2bc54954c97424a7da36deaaec Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 30 五月 2024 14:08:24 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java |   66 ++++++++++++++++++++-------------
 1 files changed, 40 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..6e003ba 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
@@ -7,6 +7,7 @@
 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 +37,26 @@
     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);
+        }
+
     }
 
     /**
@@ -61,17 +68,24 @@
     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);
+            }
+        } else {
+            this.setFieldValByName("createBy", "", metaObject);
+            this.setFieldValByName("updateBy", "", metaObject);
+            this.setFieldValByName("createTime", new Date(), metaObject);
+            this.setFieldValByName("updateTime", new Date(), metaObject);
+        }
     }
 }

--
Gitblit v1.7.1