Skip to content

Bug fix: resolve pagination error when changing pages on the Registry #4530

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
bobo495 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Bug fix: resolve pagination error when changing pages on the Registry #4530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dinky-admin/src/main/java/org/dinky/mybatis/util/ProTableUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private static void buildDelete(QueryWrapper<?> wrapper, boolean camelToUndersco

private static void buildSort(
String sortField, String sortValue, QueryWrapper<?> wrapper, boolean camelToUnderscore) {
if (sortField != null && sortValue != null) {
if (sortField != null && sortValue != null && !"undefined".equals(sortField)) {
if (camelToUnderscore) {
sortField = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortField);
}
Expand All @@ -91,7 +91,7 @@ private static void buildSort(

private static void buildFilter(
String searchField, JsonNode searchValue, QueryWrapper<?> wrapper, boolean camelToUnderscore) {
if (searchField != null && !searchField.equals("") && searchValue != null) {
if (searchField != null && !searchField.equals("") && !"undefined".equals(searchField) && searchValue != null) {
if (camelToUnderscore) {
searchField = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, searchField);
}
Expand Down