admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 17:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: NPE, close #I88DFH

Browse Source
This commit is contained in:
开源海哥 2023-10-17 10:56:17 +08:00
parent 0d337e1032
commit e00ef8c001
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java
View File

@ -54,6 +54,7 @@ public class BaseQueryWrapper<T extends BaseQueryWrapper<T>> implements CloneSup
* <p>Title: clear. </p>
* <p>Description: Default QueryWrapper values. </p>
* <p>Notice: When adding new attributes, it is necessary to supplement here. </p>
*
* @author dragon
*/
public void clear() {
@ -95,11 +96,12 @@ public class BaseQueryWrapper<T extends BaseQueryWrapper<T>> implements CloneSup
protected T setWhereQueryCondition(QueryCondition queryCondition) {
if (whereQueryCondition != null) {
queryCondition.connect(whereQueryCondition, SqlConnector.AND);
if (queryCondition != null) {
if (whereQueryCondition != null) {
queryCondition.connect(whereQueryCondition, SqlConnector.AND);
}
whereQueryCondition = queryCondition;
}
whereQueryCondition = queryCondition;
return (T) this;
}
@ -120,7 +122,6 @@ public class BaseQueryWrapper<T extends BaseQueryWrapper<T>> implements CloneSup
if (groupByColumns == null) {
groupByColumns = new ArrayList<>();
}
groupByColumns.add(queryColumn);
return (T) this;
}