From f41fc9b0a0b747affa192497bb480924219b3f3d Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 2 Apr 2020 17:52:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=96=B0=E5=A2=9EEp?= =?UTF-8?q?metBaseEntity=20update=E6=97=B6=E6=9C=BA=E7=9A=84=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85=20=E4=BF=AE=E6=94=B9=EF=BC=9A?= =?UTF-8?q?=E5=8E=BB=E6=8E=89AuthFilter=E7=9A=84@Configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/mybatis/handler/FieldMetaObjectHandler.java | 5 +++-- epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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();