diff --git a/uboot-core/pom.xml b/uboot-core/pom.xml index fc4766a..801f8e5 100644 --- a/uboot-core/pom.xml +++ b/uboot-core/pom.xml @@ -50,8 +50,8 @@ - com.chinaunicom.ebtp - mall-ebtp-cloud-seata-starter + io.seata + seata-spring-boot-starter diff --git a/uboot-core/src/main/java/com/chinaunicom/mall/ebtp/core/config/MybatisPlusMetaObjectHandler.java b/uboot-core/src/main/java/com/chinaunicom/mall/ebtp/core/config/MybatisPlusMetaObjectHandler.java index d912006..230dae1 100644 --- a/uboot-core/src/main/java/com/chinaunicom/mall/ebtp/core/config/MybatisPlusMetaObjectHandler.java +++ b/uboot-core/src/main/java/com/chinaunicom/mall/ebtp/core/config/MybatisPlusMetaObjectHandler.java @@ -1,6 +1,8 @@ package com.chinaunicom.mall.ebtp.core.config; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseCacheUserServiceImpl; import com.chinaunicom.mall.ebtp.common.constant.CommonConstants; import lombok.extern.slf4j.Slf4j; @@ -23,7 +25,7 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { @Autowired - private BaseCacheUserServiceImpl userService; + private BaseCacheUserServiceImpl userService; /** * 插入元对象字段填充(用于插入时对公共字段的填充) @@ -32,9 +34,11 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { */ @Override public void insertFill(MetaObject metaObject) { + Object obj = getFieldValByName("createBy", metaObject); - if (obj == null) { - setFieldValByName("createBy",userService.getCacheUser().getUserId() , metaObject); + BaseCacheUser cacheUser = userService.getCacheUser(); + if (obj == null && cacheUser != null) { + setFieldValByName("createBy", cacheUser.getUserId(), metaObject, FieldFill.INSERT); } obj = getFieldValByName("createDate", metaObject); if (obj == null) { @@ -42,8 +46,8 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { } obj = getFieldValByName("updateBy", metaObject); - if (obj == null) { - setFieldValByName("updateBy", userService.getCacheUser().getUserId(), metaObject); + if (obj == null && cacheUser != null) { + setFieldValByName("updateBy", cacheUser.getUserId(), metaObject); } obj = getFieldValByName("updateDate", metaObject); if (obj == null) { @@ -72,9 +76,21 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { */ @Override public void updateFill(MetaObject metaObject) { - setFieldValByName("updateBy", userService.getCacheUser().getUserId(), metaObject); - setFieldValByName("updateDate", LocalDateTime.now(), metaObject); - setFieldValByName("lastUpdateTime", LocalDateTime.now(), metaObject); + BaseCacheUser cacheUser = userService.getCacheUser(); + Object obj = null; + obj = getFieldValByName("updateBy", metaObject); + if (obj == null && cacheUser != null) { + setFieldValByName("updateBy", cacheUser.getUserId(), metaObject); + } + + obj = getFieldValByName("updateDate", metaObject); + if (obj == null) { + setFieldValByName("updateDate", LocalDateTime.now(), metaObject); + } + obj = getFieldValByName("lastUpdateTime", metaObject); + if (obj == null) { + setFieldValByName("lastUpdateTime", LocalDateTime.now(), metaObject); + } } }