diff --git a/src/main/java/com/cym/service/GroupService.java b/src/main/java/com/cym/service/GroupService.java index 4be5acb3ab011a7dab2e61f1b1b4a18fab1128f1..424fd90ca132a016b466fa33645a637b4a5e500a 100644 --- a/src/main/java/com/cym/service/GroupService.java +++ b/src/main/java/com/cym/service/GroupService.java @@ -3,6 +3,7 @@ package com.cym.service; import java.util.ArrayList; import java.util.List; +import cn.hutool.core.text.CharSequenceUtil; import org.noear.solon.annotation.Inject; import org.noear.solon.aspect.annotation.Service; @@ -29,7 +30,8 @@ public class GroupService { ConditionAndWrapper conditionAndWrapper = new ConditionAndWrapper(); if (StrUtil.isNotEmpty(keywords)) { - conditionAndWrapper.and(new ConditionOrWrapper().like(Group::getName, keywords)); + String trimKeywords = CharSequenceUtil.trim(keywords,0); + conditionAndWrapper.and(new ConditionOrWrapper().like(Group::getName, trimKeywords)); } Page pageResp = sqlHelper.findPage(conditionAndWrapper, page, Group.class); diff --git a/src/main/java/com/cym/service/RepositoryService.java b/src/main/java/com/cym/service/RepositoryService.java index ea826d1c08c538b857f2abaebdd61058351391a0..ed41fe5a5e8559ff887456d3ab9dc83f1ab4aacf 100644 --- a/src/main/java/com/cym/service/RepositoryService.java +++ b/src/main/java/com/cym/service/RepositoryService.java @@ -5,6 +5,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; +import cn.hutool.core.text.CharSequenceUtil; import org.noear.solon.annotation.Inject; import org.noear.solon.aspect.annotation.Service; import org.slf4j.Logger; @@ -45,7 +46,8 @@ public class RepositoryService { ConditionAndWrapper conditionAndWrapper = new ConditionAndWrapper(); if (StrUtil.isNotEmpty(keywords)) { - conditionAndWrapper.and(new ConditionOrWrapper().like(Repository::getName, keywords)); + String trimKeywords = CharSequenceUtil.trim(keywords,0); + conditionAndWrapper.and(new ConditionOrWrapper().like(Repository::getName, trimKeywords)); } Page pageResp = sqlHelper.findPage(conditionAndWrapper, page, Repository.class); diff --git a/src/main/java/com/cym/service/UserService.java b/src/main/java/com/cym/service/UserService.java index 49c280bc47476cefdda9f75971111291f55aa0cd..cf002c78bd0bdd2d48b195288e8d81cd1f9ea819 100644 --- a/src/main/java/com/cym/service/UserService.java +++ b/src/main/java/com/cym/service/UserService.java @@ -1,5 +1,6 @@ package com.cym.service; +import cn.hutool.core.text.CharSequenceUtil; import org.noear.solon.annotation.Inject; import org.noear.solon.aspect.annotation.Service; @@ -33,7 +34,8 @@ public class UserService { ConditionAndWrapper conditionAndWrapper = new ConditionAndWrapper(); if (StrUtil.isNotEmpty(keywords)) { - conditionAndWrapper.and(new ConditionOrWrapper().like(User::getName, keywords)); + String trimKeyWords = CharSequenceUtil.trim(keywords,0); + conditionAndWrapper.and(new ConditionOrWrapper().like(User::getName, trimKeyWords).like(User::getTrueName, trimKeyWords)); } Page pageResp = sqlHelper.findPage(conditionAndWrapper, page, User.class);