From 6f363d0fee687011f3fd37341fd7afbbdd2805c4 Mon Sep 17 00:00:00 2001 From: yujt Date: Fri, 7 May 2021 10:59:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=AC=E5=85=B1=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E4=B8=8E=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/FieldMetaObjectHandler.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java b/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java index 1a6fbc1..9702b73 100644 --- a/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java +++ b/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java @@ -42,19 +42,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { public void insertFill(MetaObject metaObject) { UserDetail user = SecurityUser.getUser(); Date date = new Date(); - if (metaObject.getOriginalObject() instanceof BaseEpdcEntity) { - String userId = user == null ? Constant.APP_USER_FLAG : String.valueOf(user.getId()); - Long deptId = user == null ? null : user.getDeptId(); - setFieldValByName(FieldConstant.CREATED_TIME_HUMP, date, metaObject); - setFieldValByName(FieldConstant.CREATED_BY_HUMP, userId, metaObject); - setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, date, metaObject); - setFieldValByName(FieldConstant.UPDATED_BY_HUMP, userId, metaObject); - setFieldValByName(FieldConstant.REVISION_HUMP, NumConstant.ZERO, metaObject); - //删除标识 - setFieldValByName(FieldConstant.DEL_FLAG_HUMP, EpdcDelFlagEnum.NORMAL.value(), metaObject); - // 数据权限标志 - setInsertFieldValByName(DEPT_ID, deptId, metaObject); - } else { + if (metaObject.getOriginalObject() instanceof BaseEntity) { if (user == null) { return; } @@ -70,6 +58,18 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { setFieldValByName(UPDATE_DATE, date, metaObject); //删除标识 setFieldValByName(FieldConstant.DEL_FLAG_HUMP, DelFlagEnum.NORMAL.value(), metaObject); + } else { + String userId = user == null ? Constant.APP_USER_FLAG : String.valueOf(user.getId()); + Long deptId = user == null ? null : user.getDeptId(); + setFieldValByName(FieldConstant.CREATED_TIME_HUMP, date, metaObject); + setFieldValByName(FieldConstant.CREATED_BY_HUMP, userId, metaObject); + setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, date, metaObject); + setFieldValByName(FieldConstant.UPDATED_BY_HUMP, userId, metaObject); + setFieldValByName(FieldConstant.REVISION_HUMP, NumConstant.ZERO, metaObject); + //删除标识 + setFieldValByName(FieldConstant.DEL_FLAG_HUMP, EpdcDelFlagEnum.NORMAL.value(), metaObject); + // 数据权限标志 + setInsertFieldValByName(DEPT_ID, deptId, metaObject); } } @@ -92,6 +92,9 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { fillEsuaEntity = true; } else if (et instanceof BaseEntity) { fillEntity = true; + } else { + // 20210507，添加疫苗接种登记模块，更新其基类字段，与更新BaseEpdcEntity字段相同 + fillEsuaEntity = true; } } }