From c630d74cbb57be7f8345981bae99a11182a2ec26 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 六月 2024 15:15:49 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DataUpdateHandlerConfig.java | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 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 ca03250..5f84b51 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;
@@ -65,22 +66,44 @@
public void updateFill(MetaObject metaObject) {
// 获取登录信息
LoginUser loginUser = tokenService.getLoginUser();
- String userName;
- if (null == loginUser) {
- userName = tokenService.getLoginUserStudy().getName();
- } else {
- userName = loginUser.getUsername();
+ 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;
}
- 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);
+ 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