Skip to content

fix(demo-template-beetl/README.md): 修复文件后缀名错误, fix(demo-orm-jdbctemplate/BaseDao): 修复getField方法未正确过滤被注解@Pk标注为主键的Field #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix(demo-template-beetl/README.md): 修复文件后缀名错误, fix(demo-orm-jdbctemplate/BaseDao): 修复getField方法未正确过滤被注解@Pk标注为主键的Field #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2308f84
fix(demo-tempalte-beetl/README.md): 修复文件后缀名错误
Oct 17, 2022
c1d624f
fix(demo-orm-jdbctemplate/BaseDao): 修复getField方法未正确过滤被注解@Pk标注为主键的Field
Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ private List<Field> getField(T t, Boolean ignoreNull) {

// 过滤数据库中不存在的字段，以及自增列
List<Field> filterField;
Stream<Field> fieldStream = CollUtil.toList(fields).stream().filter(field -> ObjectUtil.isNull(field.getAnnotation(Ignore.class)) || ObjectUtil.isNull(field.getAnnotation(Pk.class)));
Stream<Field> fieldStream = CollUtil.toList(fields).stream().filter(field -> ObjectUtil.isNull(field.getAnnotation(Ignore.class)) && ObjectUtil.isNull(field.getAnnotation(Pk.class)));

// 是否过滤字段值为null的字段
if (ignoreNull) {
Expand Down
4 changes: 2 additions & 2 deletions demo-template-beetl/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public class UserController {
}
```

## index.html
## index.btl

```jsp
<!doctype html>
Expand All @@ -152,7 +152,7 @@ public class UserController {
</html>
```

## login.html
## login.btl

```jsp
<!doctype html>
Expand Down