From eebded3e1ba70e764adb02b1a75ea26d163a3dde Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Sun, 19 Oct 2025 18:34:44 +0800 Subject: [PATCH] commit --- .../impl/ExecutiveCommitteeMemberServiceImpl.java | 8 ++++++-- .../executiveCommitteeMember/index.html | 14 ++------------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java index 2a506c5f..db34f850 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java @@ -7,6 +7,7 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Strings; @@ -50,8 +51,11 @@ public class ExecutiveCommitteeMemberServiceImpl extends BaseServiceImpl impleme cnd.andEX("op.unitId", "=", pageForm.getUnitId()); cnd.andEX("it.unionid", "=", pageForm.getUnionId()); cnd.andEX("op.delegationId", "=", pageForm.getDelegationId()); - if (Strings.isNotBlank(pageForm.getSearchName()) && Strings.isNotBlank(pageForm.getSearchKeyword())) { - cnd.and(pageForm.getSearchName(), "LIKE", "%" + pageForm.getSearchKeyword() + "%"); + if (Strings.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.orLike("op.userName", pageForm.getSearchKeyword()); + group.orLike("op.loginName", pageForm.getSearchKeyword()); + cnd.and(group); } cnd.desc("pushCount"); cnd.asc("op.firstLetter"); diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html index 146d7d39..ad9ff931 100644 --- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html @@ -6,18 +6,8 @@ layout("/layouts/platform.html"){ - - - - - - - + +