From 282d360d3bf6d4df4079d3b512b8e1319cba2c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=90=E6=98=9F=E5=AE=87?= Date: Sun, 4 Feb 2024 17:04:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=A7=93?= =?UTF-8?q?=E5=90=8D=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/service/UserService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cym/service/UserService.java b/src/main/java/com/cym/service/UserService.java index 49c280b..ab484b2 100644 --- a/src/main/java/com/cym/service/UserService.java +++ b/src/main/java/com/cym/service/UserService.java @@ -33,7 +33,7 @@ public class UserService { ConditionAndWrapper conditionAndWrapper = new ConditionAndWrapper(); if (StrUtil.isNotEmpty(keywords)) { - conditionAndWrapper.and(new ConditionOrWrapper().like(User::getName, keywords)); + conditionAndWrapper.and(new ConditionOrWrapper().like(User::getName, keywords).like(User::getTrueName, keywords)); } Page pageResp = sqlHelper.findPage(conditionAndWrapper, page, User.class); -- Gitee From 4b6fa1b4b18f8b03edc7f20634a39d9c23ace749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=90=E6=98=9F=E5=AE=87?= Date: Sun, 4 Feb 2024 17:54:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E4=BB=93=E5=BA=93=E5=88=97=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=AE=A1=E7=90=86=E5=85=B3=E9=94=AE=E5=AD=97?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8E=BB=E9=99=A4=E7=A9=BA=E7=99=BD=E5=AD=97?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/service/GroupService.java | 4 +++- src/main/java/com/cym/service/RepositoryService.java | 4 +++- src/main/java/com/cym/service/UserService.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cym/service/GroupService.java b/src/main/java/com/cym/service/GroupService.java index 4be5acb..424fd90 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 ea826d1..ed41fe5 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 ab484b2..cf002c7 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).like(User::getTrueName, 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); -- Gitee