From 64c9ab17a187d6087acbda902c01d14f5707922a Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Sun, 28 Jun 2020 16:34:36 +0800
Subject: [PATCH] 1.调整扣费业务支持feign调用 2.更新运营平台支持统一格式化时间 3.修改zuu网关,增加请求头doctorId字段,修改departmentId字段的取值

---
 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