diff --git a/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java b/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java index fd966853..e7a2e74f 100644 --- a/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java +++ b/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java @@ -29,7 +29,10 @@ public class MyMetaObjectHandler implements MetaObjectHandler { this.setFieldValByName("deleteFlag", false, metaObject); } if (metaObject.hasGetter("id")) { - this.setFieldValByName("id", String.valueOf(SnowFlake.getId()), metaObject); + //如果已经配置id,则不再写入 + if (metaObject.getValue("id") == null) { + this.setFieldValByName("id", String.valueOf(SnowFlake.getId()), metaObject); + } } } diff --git a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java b/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java index 106b0668..1e077800 100644 --- a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java +++ b/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java @@ -1,32 +1,31 @@ package cn.lili.base.mybatisplus; -import com.baomidou.mybatisplus.core.parser.ISqlParser; -import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.util.ArrayList; -import java.util.List; - /** * @author Chopper */ @Configuration -@MapperScan({"cn.lili.modules.*.*.mapper","cn.lili.modules.*.mapper"}) +@MapperScan({"cn.lili.modules.*.*.mapper", "cn.lili.modules.*.mapper"}) public class MybatisPlusConfig { /** * 分页插件,自动识别数据库类型 */ @Bean public PaginationInterceptor paginationInterceptor() { - PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); - List sqlParserList = new ArrayList<>(); - // 攻击 SQL 阻断解析器、加入解析链 - sqlParserList.add(new BlockAttackSqlParser()); - paginationInterceptor.setSqlParserList(sqlParserList); - return paginationInterceptor; + return new PaginationInterceptor(); + + //阻断解析器,测试环境使用 +// PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); +// +// List sqlParserList = new ArrayList<>(); +// // 攻击 SQL 阻断解析器、加入解析链 +// sqlParserList.add(new BlockAttackSqlParser()); +// paginationInterceptor.setSqlParserList(sqlParserList); +// return paginationInterceptor; } }