From 2308f84066947745f115be328d6041ac6b15954a Mon Sep 17 00:00:00 2001
From: zhangyitian <zhangyitian.leo@bytedance.com>
Date: Mon, 17 Oct 2022 15:22:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(demo-tempalte-beetl/README.md):=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E5=90=8E=E7=BC=80=E5=90=8D?=
=?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes https://github.com/xkcoding/spring-boot-demo/issues/237
(cherry picked from commit 7c980c593d020afe2c79e555982d1e8458e5b9b1)
---
demo-template-beetl/README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
<!doctype html>
@@ -152,7 +152,7 @@ public class UserController {
</html>
```
-## login.html
+## login.btl
```jsp
<!doctype html>
From c1d624fc64727cf11bb94cb1a46047b1fc2ecc3c Mon Sep 17 00:00:00 2001
From: zhangyitian <zhangyitian.leo@bytedance.com>
Date: Tue, 18 Oct 2022 11:07:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(demo-orm-jdbctemplate/BaseDao):=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8DgetField=E6=96=B9=E6=B3=95=E6=9C=AA=E6=AD=A3?=
=?UTF-8?q?=E7=A1=AE=E8=BF=87=E6=BB=A4=E8=A2=AB=E6=B3=A8=E8=A7=A3@Pk?=
=?UTF-8?q?=E6=A0=87=E6=B3=A8=E4=B8=BA=E4=B8=BB=E9=94=AE=E7=9A=84Field?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes https://github.com/xkcoding/spring-boot-demo/issues/239
---
.../java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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<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) {