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 a5ea6a1a37..8dbb4881f5 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
@@ -25,7 +25,9 @@ import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.swing.text.html.Option;
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * 公共字段，自动填充值
@@ -80,15 +82,16 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
     }
 
     public Object getCreatedByFieldValue(MetaObject metaObject) {
-        Object value = loginUserUtil.getLoginUserId();
-        if (value == null) {
+        Object value = null;
+
             if (metaObject.hasGetter(FieldConstant.CREATED_BY_HUMP)) {
                 value = metaObject.getValue(FieldConstant.CREATED_BY_HUMP);
             }
             if (value == null) {
-                value = Constant.APP_USER_FLAG;
+
+                value = Optional.ofNullable(loginUserUtil.getLoginUserId()).orElse(Constant.APP_USER_FLAG);
             }
-        }
+
         return value;
     }
 
@@ -115,15 +118,15 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
     }
 
     public Object getUpdatedByFieldValue(MetaObject metaObject) {
-        Object value = loginUserUtil.getLoginUserId();
-        if (value == null) {
+        Object value = null;
+
             if (metaObject.hasGetter(FieldConstant.UPDATED_BY_HUMP)) {
                 value = metaObject.getValue(FieldConstant.UPDATED_BY_HUMP);
             }
             if (value == null) {
-                value = Constant.APP_USER_FLAG;
+                value = Optional.ofNullable(loginUserUtil.getLoginUserId()).orElse(Constant.APP_USER_FLAG);
             }
-        }
+
         return value;
     }