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 051796e71c..bd7d0619fd 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 @@ -82,7 +82,6 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { public void updateFill(MetaObject metaObject) { Object originalObject = metaObject.getOriginalObject(); - Long id = SecurityUser.getUserId(); boolean fillEntity = false; boolean fillEsuaEntity = false; @@ -101,13 +100,15 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { } } if (fillEntity) { + Long id = SecurityUser.getUserId(); id = null == id ? NumConstant.ZERO_L : id; //更新者 setFieldValByName(UPDATER, id, metaObject); //更新时间 setFieldValByName(UPDATE_DATE, new Date(), metaObject); } else if (fillEsuaEntity) { - String userId = null == id ? Constant.APP_USER_FLAG : String.valueOf(id); + String loginUserId = LoginUserUtil.getLoginUserId(); + String userId = StringUtils.isBlank(loginUserId) ? Constant.APP_USER_FLAG : loginUserId; setFieldValByName(FieldConstant.UPDATED_BY_HUMP, userId, metaObject); setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, new Date(), metaObject); } diff --git a/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java b/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java index 4c83d810da..d6d2396a15 100644 --- a/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java +++ b/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java @@ -40,8 +40,8 @@ import java.util.List; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@Configuration -@ConfigurationProperties(prefix = "renren") +//@Configuration +//@ConfigurationProperties(prefix = "renren") public class AuthFilter implements GlobalFilter { private Logger logger = LoggerFactory.getLogger(getClass()); private final AntPathMatcher antPathMatcher = new AntPathMatcher();