From fc47a49be53f0ff4097ead1618e991159602f150 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 24 Nov 2020 15:59:13 +0800 Subject: [PATCH] =?UTF-8?q?updateFills=E6=97=B6updatedTime=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E5=86=8D=E5=8F=96now();insertFill=E6=97=B6updatedBy?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=8E=BB=E6=89=BEcreatedBy=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=86=8D=E6=89=BE=E4=BB=8EhttpRequest=E4=B8=AD=E8=8E=B7?= =?UTF-8?q?=E5=8F=96userId=E3=80=82=E5=A6=82=E6=9E=9C=E4=B8=8D=E6=83=B3?= =?UTF-8?q?=E8=A2=AB=E5=A4=84=E7=90=86sql=EF=BC=8Cinsert=E6=88=96update?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E8=A6=81=E4=BD=BF=E7=94=A8=E7=BB=A7=E6=89=BF?= =?UTF-8?q?=E4=BA=86BaseEpmetEntity=E7=9A=84=E5=AE=9E=E4=BD=93=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/mybatis/handler/FieldMetaObjectHandler.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java index 55743c1f32..f044a975f7 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java @@ -123,8 +123,13 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { if (metaObject.hasGetter(FieldConstant.UPDATED_BY_HUMP)) { value = metaObject.getValue(FieldConstant.UPDATED_BY_HUMP); } + if (value == null) { - value = Optional.ofNullable(loginUserUtil.getLoginUserId()).orElse(Constant.APP_USER_FLAG); + if(metaObject.hasGetter(FieldConstant.CREATED_BY_HUMP)) + value = metaObject.getValue(FieldConstant.CREATED_BY_HUMP); + + if(null == value) + value = Optional.ofNullable(loginUserUtil.getLoginUserId()).orElse(Constant.APP_USER_FLAG); } return value; @@ -160,7 +165,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { setFieldValByName(UPDATE_DATE, new Date(), metaObject); } else if (fillEsuaEntity) { setFieldValByName(FieldConstant.UPDATED_BY_HUMP, getUpdatedByFieldValue(metaObject), metaObject); - setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, new Date(), metaObject); + setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, getUpdatedTimeByFieldValue(metaObject), metaObject); } } }