ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-11-04 10:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 2.0.x

Browse Source 
# Conflicts:
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java
#	continew-admin-webapi/src/main/resources/application.yml
This commit is contained in:
Charles7c
2023-03-31 22:22:50 +08:00
parent 95c27ea323 e964c4cc4b
commit 7dda38d2b8
6 changed files with 162 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java
View File

@@ -142,7 +142,8 @@ public class QueryHelper {
String property = queryAnnotation.property();
fieldName = StrUtil.blankToDefault(property, fieldName);
String columnName = StrUtil.toUnderlineCase(fieldName);
switch (queryAnnotation.type()) {
Query.Type queryType = queryAnnotation.type();
switch (queryType) {
case EQUAL:
queryWrapper.eq(columnName, fieldValue);
break;
@@ -163,7 +164,9 @@ public class QueryHelper {
break;
case BETWEEN:
List<Object> between = new ArrayList<>((List<Object>)fieldValue);
queryWrapper.between(columnName, between.get(0), between.get(1));
if (between.size() >= 2) {
queryWrapper.between(columnName, between.get(0), between.get(1));
}
break;
case LEFT_LIKE:
queryWrapper.likeLeft(columnName, fieldValue);
@@ -191,7 +194,7 @@ public class QueryHelper {
queryWrapper.isNotNull(columnName);
break;
default:
break;
throw new IllegalArgumentException(String.format("暂不支持 [%s] 查询类型", queryType));
}
}
}