diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java index 563e7bdaa..267d13b26 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java @@ -221,7 +221,7 @@ private List getField(T t, Boolean ignoreNull) { // 过滤数据库中不存在的字段，以及自增列 List filterField; - Stream fieldStream = CollUtil.toList(fields).stream().filter(field -> ObjectUtil.isNull(field.getAnnotation(Ignore.class)) || ObjectUtil.isNull(field.getAnnotation(Pk.class))); + Stream fieldStream = CollUtil.toList(fields).stream().filter(field -> ObjectUtil.isNull(field.getAnnotation(Ignore.class)) && ObjectUtil.isNull(field.getAnnotation(Pk.class))); // 是否过滤字段值为null的字段 if (ignoreNull) { diff --git a/demo-template-beetl/README.md b/demo-template-beetl/README.md index fffc08e30..9f386d061 100644 --- a/demo-template-beetl/README.md +++ b/demo-template-beetl/README.md @@ -138,7 +138,7 @@ public class UserController { } ``` -## index.html +## index.btl ```jsp @@ -152,7 +152,7 @@ public class UserController { ``` -## login.html +## login.btl ```jsp