commit

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");

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html

@@ -6,18 +6,8 @@ layout("/layouts/platform.html"){
     <guava ref="guava">
         <el-card shadow="never">
             <search @search="doSearch">
-                <search-item label="关键字">
-                    <el-input v-model="pageForm.searchKeyword" placeholder="请填写内容">
-                        <el-select
-                                slot="prepend"
-                                v-model="pageForm.searchName"
-                                placeholder="查询"
-                                style="width: 100px;"
-                        >
-                            <el-option label="工号" value="op.loginName"></el-option>
-                            <el-option label="姓名" value="op.userName"></el-option>
-                        </el-select>
-                    </el-input>
+                <search-item label="姓名/工号">
+                    <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号"></el-input>
                 </search-item>
                 <search-item label="教代会">
                     <el-select