From 401510af482a05aa777db983791f8e7594edaec2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 08 七月 2025 13:53:55 +0800
Subject: [PATCH] 新增迭代

---
 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java |   77 +++++++++++++++++++++++++++-----------
 1 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java
index 0e17d18..33b9a89 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/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;
@@ -37,18 +38,23 @@
     public void insertFill(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);
+        this.setFieldValByName("createTime", new Date(), metaObject);
+        this.setFieldValByName("updateTime", new Date(), 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);
+            }
         }
+
     }
 
     /**
@@ -60,17 +66,44 @@
     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);
+            }
+            return;
         }
+//        LoginUserParent loginUser1 = tokenService.getLoginUser1();
+//        if (loginUser1!=null){
+//            String userName = loginUser1.getName();
+//            if (StringUtils.hasLength(userName)) {
+//                this.setFieldValByName("updateBy", userName, metaObject);
+//                this.setFieldValByName("updateTime", new Date(), metaObject);
+//            } else {
+//                this.setFieldValByName("createTime", "", metaObject);
+//                this.setFieldValByName("updateTime", "", metaObject);
+//            }
+//            return;
+//        }
+//        LoginUserParent loginUser2 = tokenService.getLoginUserStudy();
+//        if (loginUser2!=null){
+//            String userName = loginUser2.getName();
+//            if (StringUtils.hasLength(userName)) {
+//                this.setFieldValByName("updateBy", userName, metaObject);
+//                this.setFieldValByName("updateTime", new Date(), metaObject);
+//            } else {
+//                this.setFieldValByName("createTime", "", metaObject);
+//                this.setFieldValByName("updateTime", "", metaObject);
+//            }
+//        }
+
     }
 }

--
Gitblit v1.7.1