diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/Top.vue b/io.sc.platform.core.frontend/src/platform/components/grid/Top.vue
index ff764f2b..e1b8ac25 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/Top.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/Top.vue
@@ -102,7 +102,7 @@ const handleQueryFormShowField = () => {
     tools.table.queryFormDisplayFields = [...tools.table.queryFormFields];
   } else {
     // 一行应该显示的字段个数
-    const rowColsNum = queryFormColsNumComputed.value * (tools.props.queryFormRowNum || 1);
+    const rowColsNum = queryFormColsNumComputed.value * (tools.props.queryFormRowsNum || 1);
     let currRowColsNum = 0;
     tools.table.queryFormFields.forEach((item: any) => {
       if (Tools.hasOwnProperty(item, 'colSpan')) {
@@ -158,7 +158,7 @@ const handleToolbarActions = () => {
   buttons_.value = [];
   // 处理查询按钮，符合条件时给其追加更多查询按钮
   let moreQueryShow = false;
-  const rowColsNum = queryFormColsNumComputed.value * (tools.props.queryFormRowNum || 1);
+  const rowColsNum = queryFormColsNumComputed.value * (tools.props.queryFormRowsNum || 1);
   let currRowColsNum = 0;
   let showQueryFormFieldNum = 0;
   tools.table.queryFormFields.forEach((item: any) => {
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts
index 263b1aae..06be3631 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts
@@ -39,7 +39,7 @@ export class Init {
       selectedField: { type: String, default: 'selected' }, // 行数据中记录行点击选中状态的字段名
       tree: { type: Boolean, default: false }, // 树形表格模式，按照层级关系构建数据并以树形展现
       treeLazyLoad: { type: Boolean, default: false }, // 树型表格模式，懒加载
-      treeIcon: { type: Function, default: undefined }, // 树形表格模式，图标函数，带有一个参数，行数据
+      treeIcon: { type: Function, default: undefined }, // 树形表格模式，图标函数，带有一个入参，行数据
       treeDefaultExpandAll: { type: Boolean, default: false }, // 树形表格模式，树形表格数据加载后是否全部展开
       treeTickStrategy: { type: String, default: 'leaf' }, // 树形表格模式，树勾选策略，strict：节点自己，leaf：包含子节点
       treeRelationship: { type: String, default: 'parent' }, // 树形表格模式的数据关系，包括：parent, children，当为parent时组件根据数据主键与数据外键构建树形数据，否则需要自己构建好树形数据放到children属性中。
@@ -110,7 +110,7 @@ export class Init {
         type: [Number, Object],
         default: 0,
       },
-      queryFormRowNum: { type: Number, default: 1 },
+      queryFormRowsNum: { type: Number, default: 1 },
       queryFormAttrs: {
         type: Object,
         default: () => {
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/types/PropsType.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/types/PropsType.ts
index 4bda03f2..df5c7498 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/types/PropsType.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/types/PropsType.ts
@@ -206,7 +206,7 @@ export type PropsType = {
   /**
    * 查询表单显示几行
    */
-  queryFormRowNum: number,
+  queryFormRowsNum: number,
   /**
    * 查询表单 form 组件属性
    */
diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/UserSearchServiceImpl.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/UserSearchServiceImpl.java
index bb3c1951..01fd8c3a 100644
--- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/UserSearchServiceImpl.java
+++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/UserSearchServiceImpl.java
@@ -46,8 +46,7 @@ public class UserSearchServiceImpl implements UserSearchService {
             List<Criteria> userCriteriaList = new ArrayList<>();
             /**
              * 前端已将【queryCriteria、机构查询条件、角色查询条件】重新使用 and 操作进行组装，后端需提取出来进行处理。
-             * 只要存在查询条件，最外层一定是 { fieldName: null, operator: 'and', criteria: [...] }；
-             * 所以最外层无需处理，直接处理最外层的 criteria 数组。
+             * 组装的条件在 queryParameter 中数组下标第一位，格式一定是 { fieldName: null, operator: 'and', criteria: [...] }；
              */
             List<Criteria> criterias = queryParameter.getCriterias().get(0).getCriteria();
             for (Criteria criteria: criterias) {
@@ -72,12 +71,22 @@ public class UserSearchServiceImpl implements UserSearchService {
                     userCriteriaList.add(criteria);
                 }
             }
+            // 界面上查询条件进行过滤的条件会增加到 queryParameter 中的 criteria 数组中，需增加到 userCriteriaList 中。
+            addOtherCriteria(userCriteriaList, queryParameter);
             return CriteriaHandler.buildQueryParameter(queryParameter, userCriteriaList);
         } else {
             return queryParameter;
         }
     }
 
+    private void addOtherCriteria(List<Criteria> userCriteriaList, QueryParameter queryParameter) {
+        if (queryParameter.getCriterias().size() > 1) {
+            for (int i=1; i<queryParameter.getCriterias().size(); i++) {
+                userCriteriaList.add(queryParameter.getCriterias().get(i));
+            }
+        }
+    }
+
     private void roleCriteriaHandler(Equals roleCriteria, List<Criteria> userCriteriaList) throws Exception {
         QueryParameter roleQueryParameter = new QueryParameter();
         roleQueryParameter.setCriteria(roleCriteria.getValue());