调整公共插入与更新方法

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) {
+        if (metaObject.getOriginalObject() instanceof BaseEntity) {
-            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 (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;
                 }
             }
         }