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: 将用户传入的 null 转为 QueryWrapper.create() 拒绝 NPE。

Browse Source
This commit is contained in:
Suomm 2023-06-21 18:58:05 +08:00
parent 65ffdd15d1
commit 32c82b2d4c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/ProviderUtil.java
View File

@ -28,6 +28,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
@SuppressWarnings({"rawtypes", "unchecked"})
class ProviderUtil {
private ProviderUtil() {}
@ -44,6 +45,7 @@ class ProviderUtil {
Object schemaNameObj = params.get(FlexConsts.SCHEMA_NAME);
return schemaNameObj != null ? schemaNameObj.toString().trim() : null;
}
public static String getTableName(Map params) {
Object tableNameObj = params.get(FlexConsts.TABLE_NAME);
return tableNameObj != null ? tableNameObj.toString().trim() : null;
@ -76,7 +78,13 @@ class ProviderUtil {
}
public static QueryWrapper getQueryWrapper(Map params) {
return (QueryWrapper) params.get(FlexConsts.QUERY);
Object obj = params.get(FlexConsts.QUERY);
// QueryWrapper 如果为 null 则创建空的对象
// 避免多次空判断，以及 NullPointerException
if (obj == null) {
return QueryWrapper.create();
}
return (QueryWrapper) obj;
}
public static Row getRow(Map params) {