From 1781a1990f0dab8377c07886ad7b3faade8fc403 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Mon, 15 Jun 2020 16:16:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java b/kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java
index e1f169c..d24ee5c 100644
--- a/kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java
+++ b/kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java
@@ -77,8 +77,17 @@
@Override
public void updateFill(MetaObject metaObject) {
//mybatis-plus版本2.0.9+
- setFieldValByName(UPDATE_TIME, new Date(), metaObject);
- setFieldValByName(UPDATE_USER_ID, Long.valueOf(request.getHeader(SecurityConstants.USER_ID_HEADER).toString()), metaObject);
- setFieldValByName(UPDATE_USER_NAME, request.getHeader(SecurityConstants.USER_HEADER), metaObject);
+ Object updateTime = getFieldValByName(UPDATE_TIME, metaObject);
+ Object updateUserId = getFieldValByName(UPDATE_USER_ID, metaObject);
+ Object updateUserName = getFieldValByName(UPDATE_USER_NAME, metaObject);
+ if (updateTime == null) {
+ setFieldValByName(UPDATE_TIME, new Date(), metaObject);
+ }
+ if ((updateUserId == null) && (request.getHeader(SecurityConstants.USER_ID_HEADER) != null)) {
+ setFieldValByName(UPDATE_USER_ID, Long.valueOf(request.getHeader(SecurityConstants.USER_ID_HEADER).toString()), metaObject);
+ }
+ if ((updateUserName == null) && (request.getHeader(SecurityConstants.USER_HEADER) != null)) {
+ setFieldValByName(UPDATE_USER_NAME, request.getHeader(SecurityConstants.USER_HEADER), metaObject);
+ }
}
}
--
Gitblit v1.8.0