diff --git a/src/main/java/com/spring/config/MyMetaObjectHandler.java b/src/main/java/com/spring/config/MyMetaObjectHandler.java
index eacdf0f9..8b60b8e1 100644
--- a/src/main/java/com/spring/config/MyMetaObjectHandler.java
+++ b/src/main/java/com/spring/config/MyMetaObjectHandler.java
@@ -21,17 +21,25 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
 
     @Override
     public void insertFill(MetaObject metaObject) {
-        SysUserEntity user = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
-        logger.info("start insert fill ....");
-        this.strictInsertFill(metaObject,"createdDate",Date.class, new Date());
-        this.strictInsertFill(metaObject,"site",String.class, user.getSite());
-        this.strictInsertFill(metaObject,"createdBy",String.class, user.getUserDisplay());
+//        SysUserEntity user = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
+//        logger.info("start insert fill ....");
+//        this.strictInsertFill(metaObject,"createdDate",Date.class, new Date());
+//        this.strictInsertFill(metaObject,"site",String.class, user.getSite());
+//        this.strictInsertFill(metaObject,"createdBy",String.class, user.getUserDisplay());
+        logger.info("公共字段自动填充【insert】");
+        metaObject.setValue("createDate", new Date());
+        metaObject.setValue("updateDate", new Date());
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        logger.info("start update fill ....");
-        this.strictUpdateFill(metaObject, "updatedDate", Date.class, new Date());
+//        logger.info("start update fill ....");
+//        this.strictUpdateFill(metaObject, "updatedDate", Date.class, new Date());
+        if (metaObject.getValue("updateDate") == null) { // 判断公共填充字段的值是否为空，如果为空才自动填充，不为空直接结束
+            logger.info("公共字段自动填充【update】");
+            metaObject.setValue("updateDate", new Date());
+        }
+
     }
 
-}
\ No newline at end of file
+}