From 23df781ef8c79800568b43d4255cf3b29087e33d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 18 Jun 2020 18:12:05 +0800
Subject: [PATCH] 1.修改pom文件,增加版本号可配置 2.整理所有的生成model,增加将long的序列化,日期格式统一格式化注解。 3.修改注册/添加账号接口(未调试) 4.对以前写的代码,事务的回滚做统一 5.增加数据需求的列表/添加数据的接口 6.将限制账户数量从医院表转移到科室表

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