From 41c8c9d025a243ef43f1f77dd626d0834ad07d47 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Wed, 12 Mar 2025 15:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=98=E5=8C=96=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8B=E9=97=AE=E9=A2=98=EF=BC=9A=201=E3=80=81w-grid?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=9E=E6=80=A7stripe=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E8=A1=8C=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E6=98=AF=E5=90=A6=E4=BD=BF=E7=94=A8=E6=96=91=E9=A9=AC?=
 =?UTF-8?q?=E7=BA=B9=E6=98=BE=E7=A4=BA=E3=80=82=202=E3=80=81w-grid?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E4=B8=8E=E5=A4=9A=E9=80=89=E7=94=A8=E6=88=B7=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=9F=A5=E8=AF=A2=E3=80=82=203=E3=80=81w-info=20?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B1=9E=E6=80=A7=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0label=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=8Evalue=E5=AE=BD=E5=BA=A6=E3=80=82=204=E3=80=81w-grid=20?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=EF=BC=8C=E9=9C=80=E5=A2=9E=E5=8A=A0=20group-?=
 =?UTF-8?q?by-title=20=E5=B1=9E=E6=80=A7=EF=BC=8C=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=88=86=E7=BB=84=E6=A0=87=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E3=80=82=205=E3=80=81w-grid=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E8=AE=BE=E7=BD=AE=E4=BA=86=E5=88=97=E5=AE=BD=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=A4=AA=E9=95=BF=E8=A2=AB=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=BC=A0=E6=A0=87=E7=A7=BB=E4=B8=8A?=
 =?UTF-8?q?=E5=8E=BB=E6=98=BE=E7=A4=BA=E5=AE=8C=E6=95=B4=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E3=80=82=206=E3=80=81=E4=BF=AE=E5=A4=8Dw-grid=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=8F=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E3=80=82=207=E3=80=81w-toolbar=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9=E6=88=90=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=BB=E8=A6=81=E9=A2=9C=E8=89=B2=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/platform/components/form/FormField.ts |   6 +-
 .../src/platform/components/grid/Header.vue   |   4 +-
 .../src/platform/components/grid/Top.vue      |  13 +-
 .../src/platform/components/grid/Tr.vue       |   7 +-
 .../src/platform/components/grid/WGrid.vue    |   1 +
 .../grid/extra/config/AloneGroup.vue          |   5 +-
 .../components/grid/extra/group/GroupTr.vue   |   2 +-
 .../src/platform/components/grid/ts/Init.ts   |   2 +
 .../grid/ts/expose-api/src/Operator.ts        |   5 +-
 .../components/grid/ts/function/Criteria.ts   |   4 +
 .../grid/ts/function/DragAndDrop.ts           |   5 +-
 .../components/grid/ts/function/Operator.ts   |  70 +++++
 .../components/grid/ts/function/RequestApi.ts |  21 +-
 .../components/grid/ts/function/RowData.ts    |   4 +
 .../components/grid/ts/types/PropsType.ts     |   8 +
 .../src/platform/components/html/WHtmlA.vue   |  12 +-
 .../src/platform/components/index.ts          |   3 +
 .../components/select/WGridSelect.vue         |   2 +-
 .../platform/components/select/WOrgSelect.vue |  11 +-
 .../components/select/WRoleSelect.vue         | 295 ++++++++++++++++++
 .../platform/components/toolbar/Buttons.vue   |   7 +-
 .../components/toolbar/ChildrenBtn.vue        |   7 +-
 .../platform/components/toolbar/Toolbar.ts    |   2 +-
 .../platform/components/toolbar/WToolbar.vue  |   8 +-
 .../src/platform/index.ts                     |   1 +
 .../src/views/likm/Form.vue                   |  27 +-
 .../src/views/likm/Grid.vue                   |  34 +-
 io.sc.platform.lcdp/build.gradle              |   1 +
 .../controller/UserSearchController.java      |  22 ++
 .../component/service/UserSearchService.java  |  10 +
 .../service/impl/UserSearchServiceImpl.java   | 133 ++++++++
 .../support/UserSearchQueryParameter.java     |  46 +++
 .../frontend/component/vo/UserSearchVo.java   | 162 ++++++++++
 .../META-INF/platform/plugins/components.json |   4 +-
 .../user/controller/UserWebController.java    |  16 -
 .../system/user/service/UserService.java      |   9 -
 .../user/service/impl/UserServiceImpl.java    |  50 +--
 37 files changed, 914 insertions(+), 105 deletions(-)
 create mode 100644 io.sc.platform.core.frontend/src/platform/components/select/WRoleSelect.vue
 create mode 100644 io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/controller/UserSearchController.java
 create mode 100644 io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/UserSearchService.java
 create mode 100644 io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/UserSearchServiceImpl.java
 create mode 100644 io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/support/UserSearchQueryParameter.java
 create mode 100644 io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/vo/UserSearchVo.java

diff --git a/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts b/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts
index 8b563392..303c4456 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts
@@ -105,7 +105,11 @@ export const getDefaultValue = (field) => {
   } else if (field.type === 'w-checkbox-group') {
     return [];
   } else if (
-    (field.type === 'w-select' || field.type === 'w-user-select' || field.type === 'w-org-select' || field.type === 'w-grid-select') &&
+    (field.type === 'w-select' ||
+      field.type === 'w-user-select' ||
+      field.type === 'w-org-select' ||
+      field.type === 'w-grid-select' ||
+      field.type === 'w-role-select') &&
     field.multiple
   ) {
     return [];
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue b/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue
index 3cb937ae..86e68053 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue
@@ -26,7 +26,7 @@
         :class="thClassHandle(c)"
         :props="tools.titleFM.multiTitleThPropsHandle(c, props.scope)"
         style="font-weight: bold"
-        :title="c.title"
+        :title="c.label"
       >
         <span v-html="Tools.isUndefinedOrNull(c.label) ? '' : c.label"></span>
       </q-th>
@@ -56,7 +56,7 @@
           :style="col.style + (col.name === '_sortNo_' ? 'padding: 0; min-width: 50px;width: 50px;max-width:50px' : '')"
           :class="thClassHandle(col)"
           style="font-weight: bold"
-          :title="col.title"
+          :title="col.label"
         >
           <span v-html="Tools.isUndefinedOrNull(col.label) ? '' : col.label"></span>
         </q-th>
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 b507b0cc..ff764f2b 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
@@ -25,7 +25,7 @@
 
       <!-- 最右侧用户配置按钮 -->
       <div v-if="tools.props.configButton" class="flex-none pl-1">
-        <q-btn round dense :size="denseToolbarComputed ? '13px' : undefined" icon="manage_accounts" unelevated outline>
+        <q-btn round dense color="primary" :size="denseToolbarComputed ? '13px' : undefined" icon="manage_accounts" unelevated outline>
           <q-popup-proxy v-model="tools.table.configStore.showConfigPanel">
             <ConfigPanel :scope="props.scope" :grid="tools.instance"></ConfigPanel>
           </q-popup-proxy>
@@ -35,9 +35,9 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, inject, ref, onBeforeMount } from 'vue';
+import { computed, inject, ref, onBeforeMount, nextTick } from 'vue';
 import { useQuasar } from 'quasar';
-import { Tools, $t } from '@/platform';
+import { Tools, $t, eventBus } from '@/platform';
 import ConfigPanel from './extra/config/ConfigPanel.vue';
 import AdvancedQuery from './extra/advanced-query/AdvancedQuery.vue';
 import { Constant, GridTools } from './ts/index';
@@ -61,6 +61,13 @@ const props = defineProps({
 });
 const buttons = tools.bm.getButtonConfig();
 
+eventBus.on('onLocaleChanged', (local) => {
+  nextTick(() => {
+    // 语言发生变化，重新构建按钮
+    handleToolbarActions();
+  });
+});
+
 const queryFormFieldsComputed = computed(() => {
   if (localeFlag.value) {
     return tools.table.queryFormDisplayFields;
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/Tr.vue b/io.sc.platform.core.frontend/src/platform/components/grid/Tr.vue
index 90209ccc..29699529 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/Tr.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/Tr.vue
@@ -3,7 +3,10 @@
     ref="trRef"
     :props="props.scope"
     :no-hover="trNoHoverComputed"
-    :class="{ selected: trSelectedClassComputed, mouseDisabled: !scope.row[Constant.FIELD_NAMES.SELECTABLE] }"
+    :class="{
+      selected: trSelectedClassComputed,
+      mouseDisabled: !scope.row[Constant.FIELD_NAMES.SELECTABLE],
+    }"
     :draggable="draggableComputed"
     @click.stop="tools.em.rowClick($event, props.scope.row, props.scope.rowIndex)"
     @dblclick.stop="tools.em.rowDbClick($event, scope.row, scope.rowIndex)"
@@ -44,7 +47,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, inject, ref } from 'vue';
+import { computed, inject, ref, onMounted } from 'vue';
 import { Tools } from '@/platform';
 import { Constant, GridTools } from './ts/index';
 import Td from './Td.vue';
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
index ff93caaf..4e307a9b 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
@@ -169,6 +169,7 @@ onMounted(async () => {
   } else {
     tools.opFM.resetStyleVariableValue();
   }
+  tools.opFM.setStripe();
 });
 
 const getTableRef = () => {
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/extra/config/AloneGroup.vue b/io.sc.platform.core.frontend/src/platform/components/grid/extra/config/AloneGroup.vue
index c061f6b5..802f0c2a 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/extra/config/AloneGroup.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/extra/config/AloneGroup.vue
@@ -17,7 +17,7 @@
   </q-expansion-item>
 </template>
 <script setup lang="ts">
-import { inject, ref } from 'vue';
+import { inject, ref, nextTick } from 'vue';
 import { GridTools, Constant } from '../../ts/index';
 
 const tools = <GridTools>inject('tools');
@@ -50,5 +50,8 @@ const groupByFieldChange = (col: string) => {
     tools.table.configStore.aloneGroupByField = undefined;
   }
   tools.dataFM.setExtraProperty(tools.table.rows);
+  nextTick(() => {
+    tools.opFM.resetStripeStyle();
+  });
 };
 </script>
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/extra/group/GroupTr.vue b/io.sc.platform.core.frontend/src/platform/components/grid/extra/group/GroupTr.vue
index 5222fe71..ea9e5fd4 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/extra/group/GroupTr.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/extra/group/GroupTr.vue
@@ -1,7 +1,7 @@
 <template>
   <template v-if="props.scope.pageIndex === 0 && tools.table.configStore.aloneGroupRecords.length > 0">
     <template v-for="(record, index) in tools.table.configStore.aloneGroupRecords" :key="index">
-      <q-tr ref="trRef" @click.stop="changeExpand(record)">
+      <q-tr ref="trRef" class="groupTr" @click.stop="changeExpand(record)">
         <q-td :colspan="tools.cm.displayColumnNum.value">
           <q-btn
             :size="tools.table.configStore.dense || tools.table.configStore.denseBody ? 'xs' : 'sm'"
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 03ca8e34..263b1aae 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
@@ -25,6 +25,7 @@ export class Init {
       addDataUrl: { type: String, default: '' }, // 新增数据url
       editDataUrl: { type: String, default: '' }, // 修改数据url
       removeDataUrl: { type: String, default: '' }, // 删除数据url
+      customFetch: { type: Function, default: undefined }, // 自定义获取数据函数，若表格内置的查询参数或方式（GET、POST）等不满足使用场景，可使用该函数自定义进行查询，只需返回的结果结构与内置查询一致即可。
       dense: { type: Boolean, default: undefined }, // 表格整体紧凑模式
       denseHeader: { type: Boolean, default: undefined }, // 表格列标题紧凑模式
       denseBody: { type: Boolean, default: undefined }, // 表格数据行紧凑模式
@@ -32,6 +33,7 @@ export class Init {
       denseToolbar: { type: Boolean, default: true }, // 表格toolbar按钮栏紧凑模式
       sortNo: { type: Boolean, default: false }, // 是否显示排序号
       stickyNum: { type: Number, default: 0 }, // 从左侧开始冻结列数，复选框与排序列不计算在内，支持1-10列。
+      stripe: { type: [Boolean, String], default: false }, // 斑马纹，当传入布尔值时斑马纹颜色默认，当传入字符串颜色时使用传入的颜色，支持rgb颜色。
       checkboxSelection: { type: Boolean, default: true }, // checkbox选择模式，默认启用
       tickedField: { type: String, default: 'ticked' }, // 行数据中记录checkbox勾选状态的字段名
       selectedField: { type: String, default: 'selected' }, // 行数据中记录行点击选中状态的字段名
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/src/Operator.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/src/Operator.ts
index 74d4c9ba..f5958700 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/src/Operator.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/expose-api/src/Operator.ts
@@ -26,10 +26,11 @@ export class Operator extends Base {
   /**
    * 刷新表格
    */
-  refreshGrid() {
+  async refreshGrid() {
+    await this.tools?.reqApiFM.fetchData({ pagination: this.table.store.pagination });
     nextTick(() => {
-      this.tools?.reqApiFM.fetchData({ pagination: this.table.store.pagination });
       this.table.store.headerTicked = false;
+      this.tools?.opFM.resetStripeStyle();
     });
   }
 
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Criteria.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Criteria.ts
index 7d94b099..e8046200 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Criteria.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Criteria.ts
@@ -80,14 +80,17 @@ export class Criteria extends Base {
    */
   buildURLSearchParams(reqParams) {
     const urlSearchParams = new URLSearchParams(reqParams);
+    reqParams['criteria'] = <any>[];
     // 处理默认查询条件
     if (Object.keys(this.table.queryCriteria).length > 0) {
       urlSearchParams.append('criteria', JSON.stringify(this.table.queryCriteria));
+      reqParams['criteria'].push(this.table.queryCriteria);
     }
     if (this.table.advancedQueryStatus) {
       const conditions = this.advancedQueryConditions();
       if (conditions && conditions.criteria.length > 0) {
         urlSearchParams.append('criteria', JSON.stringify(conditions));
+        reqParams['criteria'].push(conditions);
       }
     } else {
       const queryForm = this.table.componentRef.getTopRef()?.getQueryForm();
@@ -106,6 +109,7 @@ export class Criteria extends Base {
                 // 根据数据进行operator处理
                 const criteria = this.buildCriteria(queryFormData[item], item);
                 urlSearchParams.append('criteria', JSON.stringify(criteria));
+                reqParams['criteria'].push(criteria);
               }
             }
           });
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/DragAndDrop.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/DragAndDrop.ts
index c7de8e41..6b352d95 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/DragAndDrop.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/DragAndDrop.ts
@@ -1,5 +1,5 @@
 import { Tools } from '@/platform';
-import { toRaw, Ref, ref } from 'vue';
+import { toRaw, Ref, ref, nextTick } from 'vue';
 import { Constant, GridTools, PropsType, TableType } from '../index';
 import { Base } from '../Base';
 
@@ -241,6 +241,9 @@ export class DragAndDrop extends Base {
     }
 
     this.tools?.em.afterDragAndDrop(this.updateOrderData);
+    nextTick(() => {
+      this.tools?.opFM.resetStripeStyle();
+    });
   }
 
   private updateDataResetOrder(waitHandleData: any) {
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Operator.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Operator.ts
index a581e12d..55fae7e0 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Operator.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Operator.ts
@@ -98,6 +98,76 @@ export class Operator extends Base {
     }
   }
 
+  /**
+   * 设置斑马纹样式
+   * @param trArr
+   */
+  private setStripeStyle(trArr: any) {
+    if (trArr.length > 0) {
+      for (let i = 0; i < trArr.length; i++) {
+        if (i % 2 !== 0) {
+          trArr[i].style['background-color'] = typeof this.props.stripe === 'boolean' ? '#fafafa' : this.props.stripe;
+        } else {
+          trArr[i].style['background-color'] = '';
+        }
+      }
+    }
+  }
+
+  private getTbodyDom() {
+    const tableElement = this.instance.getHtmlElement();
+    const tableDom = tableElement.getElementsByTagName('table')[0];
+    const tbodyDom = tableDom.getElementsByTagName('tbody')[0];
+    return tbodyDom;
+  }
+
+  private getStripeTrArr() {
+    const tbodyDom = this.getTbodyDom();
+    const result = <any>[];
+    for (let i = 0; i < tbodyDom.children.length; i++) {
+      if (!tbodyDom.children[i].classList.contains('groupTr')) {
+        result.push(tbodyDom.children[i]);
+      }
+    }
+    return result;
+  }
+
+  /**
+   * 重新设置斑马纹样式（用于拖拽排序后等场景导致的斑马纹样式错乱）
+   */
+  resetStripeStyle() {
+    if (!Tools.isEmpty(this.props.stripe) && this.props.stripe !== false) {
+      this.setStripeStyle(this.getStripeTrArr());
+    }
+  }
+
+  /**
+   * 设置斑马纹
+   */
+  setStripe() {
+    if (!Tools.isEmpty(this.props.stripe) && this.props.stripe !== false) {
+      const trArr = this.getStripeTrArr();
+      // 初始化时设置一遍样式
+      this.setStripeStyle(trArr);
+      let previousRowCount = trArr.length;
+      // 创建观察者
+      const observer = new MutationObserver((mutations) => {
+        const currentTrArr = this.getStripeTrArr();
+        const currentRowCount = currentTrArr.length;
+        if (currentRowCount !== previousRowCount) {
+          previousRowCount = currentRowCount;
+          this.setStripeStyle(currentTrArr);
+        }
+      });
+      // 启动监听
+      const tbodyDom = this.getTbodyDom();
+      observer.observe(tbodyDom, {
+        childList: true, // 监视子节点增删
+        subtree: false, // 若tr嵌套在更深层级需启用
+      });
+    }
+  }
+
   /**
    * 表格大小变化触发函数
    * @returns
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RequestApi.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RequestApi.ts
index 5560379c..fb7c3907 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RequestApi.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RequestApi.ts
@@ -234,11 +234,24 @@ export class RequestApi extends Base {
         operator: Constant.CRITERIA_OPERATOR.isNull,
       };
       urlSearchParams.append('criteria', JSON.stringify(criteria));
+      reqParams['criteria'].push(criteria);
+    }
+
+    let resp: any = undefined;
+    if (this.props.customFetch && urlSearchParams) {
+      // 用户自定义加载函数
+      try {
+        resp = await this.props.customFetch(urlSearchParams, reqParams);
+      } catch (error) {
+        console.error('[w-grid]custom fetch data error：', error);
+        this.table.store.loading = false;
+      }
+    } else {
+      resp = await axios.get(url, { params: urlSearchParams }).catch((error) => {
+        console.error('[w-grid]fetch data error：', error);
+        this.table.store.loading = false;
+      });
     }
-    const resp = await axios.get(url, { params: urlSearchParams }).catch((error) => {
-      console.error('[w-grid]fetch data error：', error);
-      this.table.store.loading = false;
-    });
     return resp;
   }
 
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts
index ab2e34bb..158f7828 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts
@@ -9,6 +9,7 @@ import { Constant, GridTools, PropsType, TableType } from '../index';
  */
 export class RowData extends Base {
   private aloneGroupRowIndex: number = 0;
+  private rowIndex: number = 0;
 
   constructor(props: PropsType, table: TableType) {
     super(props, table);
@@ -137,6 +138,7 @@ export class RowData extends Base {
     this.table.configStore.aloneGroupRecords = [];
     // 重置分组行下标
     this.aloneGroupRowIndex = 0;
+    this.rowIndex = 0;
     if (this.props.groupMode === Constant.GROUP_MODE.MERGE && !this.props.tree) {
       // 如果存在需要合并的字段，并且不是树表格，重新对数据进行排序
       this.table.store.mergeGroupRecords = {};
@@ -392,6 +394,7 @@ export class RowData extends Base {
     rowData[this.props.selectedField] = this.getInitRowSelected(rowData);
     rowData[Constant.FIELD_NAMES.ROW_OLD_VALUE] = {};
     rowData[Constant.FIELD_NAMES.SELECTABLE] = this.getInitSelectable(rowData);
+    rowData[Constant.FIELD_NAMES.ROW_INDEX] = this.rowIndex;
     if (this.props.tree) {
       rowData[Constant.FIELD_NAMES.TREE_TICKABLE] = this.getInitTreeTickable(rowData);
     }
@@ -406,6 +409,7 @@ export class RowData extends Base {
         rowData[Constant.FIELD_NAMES.LAZYLOAD_NO_CHILDREN] = true;
       }
     }
+    this.rowIndex += 1;
   }
 
   /**
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 9556335f..4bda03f2 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
@@ -55,6 +55,10 @@ export type PropsType = {
    * 删除数据url
    */
   removeDataUrl: string,
+  /**
+   * 自定义获取数据函数，若表格内置的查询参数或方式（GET、POST）等不满足使用场景，可使用该函数自定义进行查询，只需返回的结果结构与内置查询一致即可。
+   */
+  customFetch: Function | undefined,
   /**
    * 表格整体紧凑模式
    */
@@ -83,6 +87,10 @@ export type PropsType = {
    * 从左侧开始冻结列数，复选框与排序列不计算在内，支持1-10列。
    */
   stickyNum: number,
+  /**
+   * 斑马纹，当传入布尔值时斑马纹颜色默认，当传入字符串颜色时使用传入的颜色，支持rgb颜色。
+   */
+  stripe: boolean | string,
   /**
    * checkbox选择模式，默认启用
    */
diff --git a/io.sc.platform.core.frontend/src/platform/components/html/WHtmlA.vue b/io.sc.platform.core.frontend/src/platform/components/html/WHtmlA.vue
index 27be06c3..e38c2004 100644
--- a/io.sc.platform.core.frontend/src/platform/components/html/WHtmlA.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/html/WHtmlA.vue
@@ -1,5 +1,5 @@
 <template>
-  <a :href="href" style="cursor: pointer; color: blue" v-bind="attrs">{{ label }}</a>
+  <a :href="href" style="cursor: pointer; color: blue" v-bind="attrs" @click.stop="click">{{ label }}</a>
 </template>
 
 <script setup lang="ts">
@@ -13,5 +13,15 @@ const attrs = useAttrs();
 const props = defineProps({
   label: { type: String, default: '' },
   href: { type: String, default: 'javascript:void 0;' },
+  onClick: {
+    type: Function,
+    default: undefined,
+  },
 });
+
+const click = (event: any) => {
+  if (props.onClick) {
+    props.onClick(event);
+  }
+};
 </script>
diff --git a/io.sc.platform.core.frontend/src/platform/components/index.ts b/io.sc.platform.core.frontend/src/platform/components/index.ts
index 9dcbdbc0..5581ee9a 100644
--- a/io.sc.platform.core.frontend/src/platform/components/index.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/index.ts
@@ -22,6 +22,7 @@ import WInputSelect from './select/WInputSelect.vue';
 import WGridSelect from './select/WGridSelect.vue';
 import WUserSelect from './select/WUserSelect.vue';
 import WOrgSelect from './select/WOrgSelect.vue';
+import WRoleSelect from './select/WRoleSelect.vue';
 import WDate from './date/WDate.vue';
 import WDateRange from './date/WDateRange.vue';
 import WCheckbox from './checkbox/WCheckbox.vue';
@@ -87,6 +88,7 @@ export default {
     app.component('WGridSelect', WGridSelect);
     app.component('WUserSelect', WUserSelect);
     app.component('WOrgSelect', WOrgSelect);
+    app.component('WRoleSelect', WRoleSelect);
     app.component('WDate', WDate);
     app.component('WDateRange', WDateRange);
     app.component('WCheckbox', WCheckbox);
@@ -148,6 +150,7 @@ export {
   WGridSelect,
   WUserSelect,
   WOrgSelect,
+  WRoleSelect,
   WLabel,
   WDate,
   WCheckbox,
diff --git a/io.sc.platform.core.frontend/src/platform/components/select/WGridSelect.vue b/io.sc.platform.core.frontend/src/platform/components/select/WGridSelect.vue
index d4029405..724f258d 100644
--- a/io.sc.platform.core.frontend/src/platform/components/select/WGridSelect.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/select/WGridSelect.vue
@@ -313,7 +313,7 @@ const rowClick = (args) => {
 watch(
   () => modelValue.value,
   async (newVal, oldVal) => {
-    if (Tools.isEmpty(newVal)) {
+    if (Tools.isEmpty(newVal) || (Array.isArray(modelValue.value) && modelValue.value.length === 0)) {
       fieldMethodsClass.clearObjectValue();
     } else if (newVal !== oldVal && needFetchData.value) {
       await fetchData(newVal);
diff --git a/io.sc.platform.core.frontend/src/platform/components/select/WOrgSelect.vue b/io.sc.platform.core.frontend/src/platform/components/select/WOrgSelect.vue
index 1294590b..98007354 100644
--- a/io.sc.platform.core.frontend/src/platform/components/select/WOrgSelect.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/select/WOrgSelect.vue
@@ -34,8 +34,10 @@
                 :dense="true"
                 :tree="true"
                 :fetch-data-url="orgGridFetchDataUrl"
+                :tree-default-expand-all="props.defaultExpandAll"
                 :config-button="false"
                 :toolbar-actions="['expand']"
+                :query-criteria="props.queryCriteria"
                 :columns="[
                   { name: 'name', label: $t('name'), sortable: false },
                   { name: 'code', label: $t('code'), width: 100, sortable: false },
@@ -82,6 +84,8 @@ interface FieldProps extends FormFieldProps {
   counter?: boolean;
   valueUseId?: boolean;
   displayValue?: string | ((args: object) => '');
+  defaultExpandAll?: boolean;
+  queryCriteria?: object;
 }
 const props = withDefaults(defineProps<FieldProps>(), {
   showIf: true,
@@ -103,6 +107,11 @@ const props = withDefaults(defineProps<FieldProps>(), {
    * }
    */
   displayValue: 'name',
+  /**
+   * 机构树默认展开所有节点
+   */
+  defaultExpandAll: true,
+  queryCriteria: undefined,
 });
 class FieldMethods extends FormFieldMethods {
   updateValue = (value_) => {
@@ -218,7 +227,7 @@ watch(
     if (newVal !== oldVal) {
       fieldMethodsClass.updateValue(newVal);
     }
-    if (Tools.isEmpty(newVal)) {
+    if (Tools.isEmpty(newVal) || (Array.isArray(modelValue.value) && modelValue.value.length === 0)) {
       fieldMethodsClass.clearObjectValue();
     } else if (newVal !== oldVal) {
       if (modelObjectValue.value.length > 0) {
diff --git a/io.sc.platform.core.frontend/src/platform/components/select/WRoleSelect.vue b/io.sc.platform.core.frontend/src/platform/components/select/WRoleSelect.vue
new file mode 100644
index 00000000..ce7a5939
--- /dev/null
+++ b/io.sc.platform.core.frontend/src/platform/components/select/WRoleSelect.vue
@@ -0,0 +1,295 @@
+<template>
+  <div v-show="fieldMethodsClass.getShow(props, modelValue)">
+    <q-input
+      ref="textSelectRef"
+      v-model="displayValueComputed"
+      :hide-bottom-space="true"
+      :hide-hint="true"
+      :outlined="true"
+      :dense="true"
+      :autogrow="true"
+      v-bind="attrs"
+      :bottom-slots="counter"
+      type="text"
+      :rules="fieldMethodsClass.getRules(props, { value: modelValue, displayValue: displayValueComputed }, textSelectRef, undefined)"
+      :readonly="fieldMethodsClass.getReadOnly(props, { value: modelValue, displayValue: displayValueComputed })"
+      :disable="fieldMethodsClass.getDisable(props, { value: modelValue, displayValue: displayValueComputed })"
+      :clearable="false"
+      @focus="
+        () => {
+          textSelectRef?.blur();
+        }
+      "
+    >
+      <template #label><w-label :required="fieldMethodsClass.getRequired(props, modelValue)" :label="attrs.label"></w-label></template>
+      <template v-if="!props['form'] || (props['form'] && props['form'].getStatus() !== 'view')" #append>
+        <q-btn v-if="!Tools.isEmpty(displayValueComputed)" flat square unelevated dense icon="cancel" @click="fieldMethodsClass.clearValue"></q-btn>
+        <q-btn flat square unelevated dense icon="pageview">
+          <q-popup-proxy v-model:model-value="isShow" anchor="bottom right" self="top right" :offset="[0, 10]">
+            <div style="width: 700px; height: 300px">
+              <w-grid
+                ref="roleGridRef"
+                title="角色列表"
+                :checkbox-selection="props.multiple || false"
+                :dense="true"
+                :fetch-data-url="roleGridFetchDataUrl"
+                :config-button="false"
+                :query-form-cols-num="2"
+                :toolbar-actions="['query', 'reset']"
+                :query-criteria="props.queryCriteria"
+                :query-form-fields="[
+                  { name: 'code', label: $t('code'), type: 'w-text' },
+                  { name: 'name', label: $t('name'), type: 'w-text' },
+                  {
+                    name: 'enable',
+                    label: $t('status'),
+                    type: 'w-select',
+                    options: [
+                      { label: '正常', value: 1 },
+                      { label: '禁用', value: 0 },
+                    ],
+                  },
+                  { name: 'description', label: $t('description'), type: 'w-text' },
+                ]"
+                :columns="[
+                  { name: 'code', label: $t('code') },
+                  { name: 'name', label: $t('name') },
+                  { name: 'enable', label: $t('status'), format: Formater.enableTag(), width: 80 },
+                  { name: 'description', label: $t('description') },
+                ]"
+                :ticked-record="{
+                  columnName: valueUseColumnName,
+                  data: typeof modelValue === 'string' ? [modelValue] : modelValue,
+                }"
+                db-click-operation="none"
+                @row-click="rowClick"
+                @update-ticked="updateTicked"
+              >
+              </w-grid>
+            </div>
+          </q-popup-proxy>
+        </q-btn>
+      </template>
+      <template v-if="counter" #counter>
+        <div>{{ modelValue?.length }}</div>
+      </template>
+    </q-input>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, useAttrs, toRaw, watch, onMounted } from 'vue';
+import { Tools, axios, Environment, Formater } from '@/platform';
+import { FormFieldProps } from '@/platform/components/form/FormField.ts';
+import { FormFieldMethods } from '../form/FormField';
+
+const textSelectRef = ref();
+const attrs = useAttrs();
+const modelValue = defineModel<string | Array<string>>();
+const modelObjectValue = ref(<any>[]); // 模型值包含实际值与显示值的对象集合。
+const roleGridRef = ref();
+
+const roleGridFetchDataUrl = Environment.apiContextPath('/api/system/role');
+const isShow = ref(false);
+
+interface FieldProps extends FormFieldProps {
+  multiple?: boolean;
+  counter?: boolean;
+  valueUseId?: boolean;
+  displayValue?: string | ((args: object) => '');
+  queryCriteria?: object;
+}
+const props = withDefaults(defineProps<FieldProps>(), {
+  showIf: true,
+  multiple: false, // 是否允许多选，多选模式下模型绑定值必须为数组
+  counter: false, // 显示右下角计数器
+  /**
+   * 值使用id绑定，false则使用code
+   */
+  valueUseId: true,
+  /**
+   * 显示值配置，可使用选项：
+   * code：编码
+   * name：名称，组件默认使用该选项
+   * nameAppendCode：名称追加编码，示例：系统管理员(admin)，
+   * codeAppendName：编码追加名称，示例：admin(上海分行)
+   * 自定义函数：自己定义显示的内容，组件会将用户数据传到函数中，函数必须返回一个字符串，示例：
+   * displayValue: (args) => {
+   *   return args['data']['name'] + '_' + args['data']['code'];
+   * }
+   */
+  displayValue: 'name',
+  queryCriteria: undefined, // 角色列表criteria查询条件
+});
+class FieldMethods extends FormFieldMethods {
+  updateValue = (value_) => {
+    if (props['onUpdateValue']) {
+      props['onUpdateValue']({
+        value: value_,
+        displayValue: displayValueComputed.value,
+        form: props['form'],
+      });
+    }
+  };
+  validate = () => {
+    return textSelectRef.value.validate();
+  };
+
+  setValue = (value) => {
+    if (props.multiple && Array.isArray(value) && Array.isArray(modelValue.value)) {
+      fieldMethodsClass.clearValue();
+      modelValue.value.push(...value);
+      setObjectValueByValue(value);
+    } else if (!props.multiple && !Array.isArray(value)) {
+      modelValue.value = value;
+      setObjectValueByValue(value);
+    } else {
+      console.info('error========模型值不匹配');
+    }
+  };
+  getValue = () => {
+    return modelValue.value;
+  };
+  getObjectValue = () => {
+    return modelObjectValue.value;
+  };
+  // 组件清空值
+  clearValue = () => {
+    if (props.multiple && Array.isArray(modelValue.value)) {
+      modelValue.value.splice(0, modelValue.value.length);
+    } else {
+      modelValue.value = undefined;
+    }
+    fieldMethodsClass.clearObjectValue();
+  };
+  // 清空显示值
+  clearObjectValue = () => {
+    modelObjectValue.value.splice(0, modelObjectValue.value.length);
+  };
+}
+const fieldMethodsClass = new FieldMethods();
+const valueUseColumnName = props.valueUseId ? 'id' : 'code';
+
+const displayValueComputed = computed(() => {
+  let result = '';
+  if (modelObjectValue.value.length > 0) {
+    modelObjectValue.value.forEach((item) => {
+      result = result + ',' + item['displayValue'];
+    });
+    result = result.substring(1, result.length);
+  }
+  return result;
+});
+
+const getActualDisplayValue = (row) => {
+  if (!Tools.isEmpty(props.displayValue) && typeof props.displayValue === 'function') {
+    return props.displayValue({
+      data: toRaw(row),
+      grid: roleGridRef.value,
+    });
+  } else if (!Tools.isEmpty(props.displayValue) && typeof props.displayValue === 'string') {
+    if (props.displayValue === 'code') {
+      return row['code'];
+    } else if (props.displayValue === 'name') {
+      return row['name'];
+    } else if (props.displayValue === 'codeAppendName') {
+      return row['code'] + '(' + row['name'] + ')';
+    } else if (props.displayValue === 'nameAppendCode') {
+      return row['name'] + '(' + row['code'] + ')';
+    }
+  }
+  return '';
+};
+
+const updateTicked = (args) => {
+  if (Array.isArray(modelValue.value)) {
+    fieldMethodsClass.clearValue();
+    const rows = roleGridRef.value.getTickedRows();
+    if (rows?.length > 0) {
+      rows.forEach((item) => {
+        modelValue.value.push(item[valueUseColumnName]);
+        modelObjectValue.value.push({ value: item[valueUseColumnName], displayValue: getActualDisplayValue(item) });
+      });
+    }
+  }
+};
+const rowClick = (args) => {
+  const modelValue_ = args.row[valueUseColumnName];
+  if (props.multiple && Array.isArray(modelValue.value)) {
+    fieldMethodsClass.clearValue();
+    modelValue.value.push(modelValue_);
+    modelObjectValue.value.push({ value: modelValue_, displayValue: getActualDisplayValue(args.row) });
+  } else if (!props.multiple) {
+    fieldMethodsClass.clearValue();
+    modelValue.value = modelValue_;
+    modelObjectValue.value.push({ value: modelValue_, displayValue: getActualDisplayValue(args.row) });
+  } else {
+    console.info('error========模型值不匹配');
+  }
+  isShow.value = false;
+};
+
+watch(
+  () => modelValue.value,
+  (newVal, oldVal) => {
+    if (newVal !== oldVal) {
+      fieldMethodsClass.updateValue(newVal);
+    }
+    if (Tools.isEmpty(newVal) || (Array.isArray(modelValue.value) && modelValue.value.length === 0)) {
+      fieldMethodsClass.clearObjectValue();
+    } else if (newVal !== oldVal) {
+      if (modelObjectValue.value.length > 0) {
+        const tempValue = modelObjectValue.value.find((item) => item.value === newVal);
+        if (!tempValue) {
+          setObjectValueByValue(newVal);
+        }
+      } else {
+        setObjectValueByValue(newVal);
+      }
+    }
+  },
+);
+
+// 根据实际值设置显示值
+const setObjectValueByValue = async (value) => {
+  if ((Array.isArray(value) && value.length > 0) || (typeof value === 'string' && !Tools.isEmpty(value))) {
+    fieldMethodsClass.clearObjectValue();
+    const urlSearchParams = new URLSearchParams();
+    urlSearchParams.append(
+      'criteria',
+      JSON.stringify({
+        fieldName: valueUseColumnName,
+        operator: 'inSet',
+        value: Array.isArray(value) ? value : [value],
+      }),
+    );
+    const resp = await axios.get(roleGridFetchDataUrl, { params: urlSearchParams }).catch((error) => {
+      console.info('error-------------', error);
+    });
+    if (resp && resp.data) {
+      const responseData = resp.data;
+      if (Array.isArray(responseData) && responseData.length > 0) {
+        responseData.forEach((item) => {
+          modelObjectValue.value.push({ value: item[valueUseColumnName], displayValue: getActualDisplayValue(item) });
+        });
+      } else if (typeof responseData === 'object' && responseData.content?.length > 0) {
+        responseData.content.forEach((item) => {
+          modelObjectValue.value.push({ value: item[valueUseColumnName], displayValue: getActualDisplayValue(item) });
+        });
+      }
+    }
+  }
+};
+
+onMounted(() => {
+  setObjectValueByValue(modelValue.value);
+});
+
+defineExpose({
+  validate: fieldMethodsClass.validate,
+  setValue: fieldMethodsClass.setValue,
+  getValue: fieldMethodsClass.getValue,
+  getObjectValue: fieldMethodsClass.getObjectValue,
+  clearValue: fieldMethodsClass.clearValue,
+});
+</script>
diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/Buttons.vue b/io.sc.platform.core.frontend/src/platform/components/toolbar/Buttons.vue
index 6063854d..57a4d677 100644
--- a/io.sc.platform.core.frontend/src/platform/components/toolbar/Buttons.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/Buttons.vue
@@ -16,6 +16,7 @@
         outline
         no-wrap
         no-caps
+        color="primary"
         v-bind="btn.data[0]"
         :label="toolbar.props.dense ? '' : toolbar.getLabel(btn.data[0].label)"
         :icon="toolbar.props.dense ? undefined : toolbar.getIcon(btn.data[0].icon)"
@@ -31,7 +32,7 @@
             <span style="padding-left: 3px">{{ toolbar.getLabel(btn.data[0].label) }}</span>
           </div>
         </template>
-        <q-list>
+        <q-list class="text-primary">
           <template v-for="(childrenBtn, childrenIndex) in btn.data" :key="'button_c_' + childrenIndex">
             <template v-if="childrenIndex === 0"></template>
             <template v-else>
@@ -64,6 +65,7 @@
         no-wrap
         no-caps
         outline
+        color="primary"
         v-bind="btn.data"
         align="center"
         :icon="toolbar.props.dense ? undefined : toolbar.getIcon(btn.data.icon)"
@@ -86,6 +88,7 @@
       label=""
       no-wrap
       no-caps
+      color="primary"
       :icon="undefined"
       :dense="toolbar.props.dense"
       class="class-more-action"
@@ -96,7 +99,7 @@
           <span>{{ $t('more') }}</span>
         </div>
       </template>
-      <q-list>
+      <q-list class="text-primary">
         <template v-for="(childrenBtn, childrenIndex) in moreButtons" :key="'moreAction_' + childrenIndex">
           <q-separator v-if="typeof childrenBtn.data === 'string' && childrenBtn.data === 'separator'" />
           <ChildrenBtn v-else-if="Array.isArray(childrenBtn.data) && childrenBtn.data.length > 0" :button="childrenBtn.data"></ChildrenBtn>
diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue b/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue
index 7b038453..d3559aae 100644
--- a/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue
@@ -6,11 +6,12 @@
       >
     </q-item-section>
     <q-item-section side>
-      <q-icon name="keyboard_arrow_right" />
+      <q-icon v-if="button[0]?.enableIf && !button[0].enableIf(toolbar.cm.args.value)" name="keyboard_arrow_right" />
+      <q-icon v-else name="keyboard_arrow_right" color="primary" />
     </q-item-section>
 
-    <q-menu anchor="top end" self="top start">
-      <q-list>
+    <q-menu anchor="top end" self="top start" class="w-toolbar-menu">
+      <q-list class="text-primary">
         <template v-for="(childrenBtn, index) in button" :key="index">
           <template v-if="index === 0 && !childrenBtn.click"></template>
           <q-separator v-else-if="typeof childrenBtn === 'string' && childrenBtn === 'separator'" />
diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/Toolbar.ts b/io.sc.platform.core.frontend/src/platform/components/toolbar/Toolbar.ts
index 8b1001fd..b6271fcc 100644
--- a/io.sc.platform.core.frontend/src/platform/components/toolbar/Toolbar.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/Toolbar.ts
@@ -181,7 +181,7 @@ export class Toolbar {
    * 提取按钮到json中
    * @param buttonArray
    */
-  private extractButton(buttonArray: any) {
+  extractButton(buttonArray: any) {
     for (const btn of buttonArray) {
       if (Array.isArray(btn)) {
         this.extractButton(btn);
diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue b/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue
index b4fb4401..ca1d96c4 100644
--- a/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue
@@ -38,6 +38,8 @@ provide('toolbar', toolbar);
 watch(
   () => modelValue.value,
   (newVal, oldVal) => {
+    // 重新提取按钮属性，避免出现label未更新的情况
+    toolbar.extractButton(modelValue.value);
     // 按钮发生变化，重新构建
     buildToolbar();
   },
@@ -59,7 +61,7 @@ const calcButtonWidth = () => {
 
 // 构建基础按钮与更多按钮
 const buildButtons = () => {
-  baseButtons.value = [];
+  baseButtons.value.splice(0);
   moreButtons.value = [];
   // 可用宽度
   let availableWidth = containerRef.value.clientWidth;
@@ -123,6 +125,10 @@ defineExpose({
   opacity: 0.6 !important;
   color: #a8a8a8;
 }
+.w-toolbar-menu .q-item.disabled {
+  opacity: 0.6 !important;
+  color: #a8a8a8;
+}
 .w-toolbar .q-btn-dropdown__arrow {
   margin-left: 0px !important;
 }
diff --git a/io.sc.platform.core.frontend/src/platform/index.ts b/io.sc.platform.core.frontend/src/platform/index.ts
index 412c7385..c7762451 100644
--- a/io.sc.platform.core.frontend/src/platform/index.ts
+++ b/io.sc.platform.core.frontend/src/platform/index.ts
@@ -149,6 +149,7 @@ export {
   WGridSelect,
   WOrgSelect,
   WUserSelect,
+  WRoleSelect,
   WLabel,
   WDate,
   WCheckbox,
diff --git a/io.sc.platform.core.frontend/src/views/likm/Form.vue b/io.sc.platform.core.frontend/src/views/likm/Form.vue
index f71a3bdb..2e36db7e 100644
--- a/io.sc.platform.core.frontend/src/views/likm/Form.vue
+++ b/io.sc.platform.core.frontend/src/views/likm/Form.vue
@@ -227,7 +227,6 @@
           label: '数字',
           type: 'w-number',
           precision: 2,
-          prefix: '￥',
           colsFirst: true,
           colSpan: 'full',
           requiredIf: (args) => {
@@ -332,6 +331,26 @@
           type: 'w-user-select',
           multiple: true,
           requiredIf: true,
+          orgQueryCriteria: {
+            operator: 'or',
+            criteria: [
+              {
+                fieldName: 'id',
+                operator: 'equals',
+                value: '2a6646d4-3bfa-480f-a3fc-5f298af96311',
+              },
+              {
+                fieldName: 'parent',
+                operator: 'equals',
+                value: '2a6646d4-3bfa-480f-a3fc-5f298af96311',
+              },
+            ],
+          },
+          roleQueryCriteria: {
+            fieldName: 'code',
+            operator: 'equals',
+            value: 'KHJL',
+          },
         },
         {
           name: 'test15',
@@ -339,6 +358,12 @@
           type: 'w-org-select',
           requiredIf: true,
         },
+        {
+          name: 'test155',
+          label: '角色选择',
+          type: 'w-role-select',
+          requiredIf: true,
+        },
         {
           name: 'test16',
           label: 'cron表达式',
diff --git a/io.sc.platform.core.frontend/src/views/likm/Grid.vue b/io.sc.platform.core.frontend/src/views/likm/Grid.vue
index 50bac73d..b7b8d409 100644
--- a/io.sc.platform.core.frontend/src/views/likm/Grid.vue
+++ b/io.sc.platform.core.frontend/src/views/likm/Grid.vue
@@ -2,23 +2,51 @@
   <w-grid
     title="用户列表"
     :checkbox-selection="false"
-    :fetch-data-url="Environment.apiContextPath('/api/system/user')"
+    :data-url="Environment.apiContextPath('/api/system/user')"
     :pageable="false"
-    :toolbar-actions="['query', 'reset']"
+    :toolbar-actions="[
+      'query',
+      'reset',
+      'separator',
+      'add',
+      'edit',
+      'remove',
+      'expand',
+      [
+        {
+          name: 'ddd',
+          icon: 'add',
+          label: $t('loginName'),
+        },
+        'addTop',
+        ['addChild', 'cellEdit', 'clone'],
+      ],
+    ]"
     :advanced-query="true"
+    :stripe="true"
     :query-form-fields="[
+      { name: 'defaultOrgId', label: '所属机构', type: 'w-org-select', multiple: true },
       { name: 'lastModifyDate', label: $t('lastModifyDate'), type: 'w-date-range' },
       { name: 'loginName', label: $t('loginName'), type: 'w-text', showIf: true },
       { name: 'userName', label: $t('userName'), type: 'w-text' },
     ]"
     :columns="[
-      { name: 'loginName', label: $t('loginName') },
+      { name: 'loginName', label: '很长很长的表头可绕地球一圈', width: 100, title: 'dfdf' },
       { name: 'userName', label: $t('userName') },
+      { name: 'lastModifier', label: '最后修改人' },
       {
         name: 'lastModifyDate',
         label: $t('lastModifyDate'),
       },
     ]"
+    :editor="{
+      form: {
+        fields: [
+          { name: 'loginName', label: $t('loginName'), type: 'w-text' },
+          { name: 'userName', label: $t('userName'), type: 'w-text' },
+        ],
+      },
+    }"
   ></w-grid>
 </template>
 <script setup lang="ts">
diff --git a/io.sc.platform.lcdp/build.gradle b/io.sc.platform.lcdp/build.gradle
index 840d24cd..313f1f5e 100644
--- a/io.sc.platform.lcdp/build.gradle
+++ b/io.sc.platform.lcdp/build.gradle
@@ -1,6 +1,7 @@
 dependencies {
     api(
         project(":io.sc.platform.mvc"),
+        project(":io.sc.platform.system"),
         project(":io.sc.platform.lcdp.frontend"),
     )
 }
diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/controller/UserSearchController.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/controller/UserSearchController.java
new file mode 100644
index 00000000..ec2e2695
--- /dev/null
+++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/controller/UserSearchController.java
@@ -0,0 +1,22 @@
+package io.sc.platform.lcdp.frontend.component.controller;
+
+import io.sc.platform.lcdp.frontend.component.service.UserSearchService;
+import io.sc.platform.lcdp.frontend.component.support.UserSearchQueryParameter;
+import io.sc.platform.lcdp.frontend.component.vo.UserSearchVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController("io.sc.platform.lcdp.frontend.component.controller.UserSearchController")
+@RequestMapping("/api/lcdp/userSearch")
+public class UserSearchController {
+    @Autowired private UserSearchService service;
+
+    @PostMapping("queryUser")
+    public Page<UserSearchVo> queryUser(@RequestBody UserSearchQueryParameter userSearchQueryParameter) throws Exception {
+        return service.queryUser(userSearchQueryParameter);
+    }
+}
diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/UserSearchService.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/UserSearchService.java
new file mode 100644
index 00000000..5281439c
--- /dev/null
+++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/UserSearchService.java
@@ -0,0 +1,10 @@
+package io.sc.platform.lcdp.frontend.component.service;
+
+import io.sc.platform.lcdp.frontend.component.support.UserSearchQueryParameter;
+import io.sc.platform.lcdp.frontend.component.vo.UserSearchVo;
+import org.springframework.data.domain.Page;
+
+public interface UserSearchService {
+
+    Page<UserSearchVo> queryUser(UserSearchQueryParameter userSearchQueryParameter) throws Exception;
+}
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
new file mode 100644
index 00000000..8b037800
--- /dev/null
+++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/service/impl/UserSearchServiceImpl.java
@@ -0,0 +1,133 @@
+package io.sc.platform.lcdp.frontend.component.service.impl;
+
+import io.sc.platform.lcdp.frontend.component.service.UserSearchService;
+import io.sc.platform.lcdp.frontend.component.support.UserSearchQueryParameter;
+import io.sc.platform.lcdp.frontend.component.vo.UserSearchVo;
+import io.sc.platform.orm.service.support.OperatorType;
+import io.sc.platform.orm.service.support.QueryParameter;
+import io.sc.platform.orm.service.support.criteria.Criteria;
+import io.sc.platform.orm.service.support.criteria.impl.InSet;
+import io.sc.platform.orm.util.EntityVoUtil;
+import io.sc.platform.system.department.jpa.entity.DepartmentEntity;
+import io.sc.platform.system.org.jpa.entity.OrgEntity;
+import io.sc.platform.system.org.service.OrgService;
+import io.sc.platform.system.role.jpa.entity.RoleEntity;
+import io.sc.platform.system.role.service.RoleService;
+import io.sc.platform.system.user.jpa.entity.UserEntity;
+import io.sc.platform.system.user.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class UserSearchServiceImpl implements UserSearchService {
+
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private OrgService orgService;
+    @Autowired
+    private RoleService roleService;
+
+    @Override
+    public Page<UserSearchVo> queryUser(UserSearchQueryParameter userSearchQueryParameter) throws Exception {
+        QueryParameter queryParameter = userSearchQueryParameter.getQueryParameter();
+        QueryParameter orgQueryParameter = userSearchQueryParameter.getOrgQueryParameter();
+        QueryParameter roleQueryParameter = userSearchQueryParameter.getRoleQueryParameter();
+        if (orgQueryParameter!=null) {
+            List<OrgEntity> orgList = orgService.list(orgQueryParameter);
+            List<String> orgIds = orgList.stream().map(OrgEntity::getId).collect(Collectors.toList());
+            if (orgIds!=null && orgIds.size() > 0) {
+                InSet inSet = new InSet();
+                inSet.setFieldName("orgs");
+                inSet.setOperator(OperatorType.inSet);
+                inSet.setValue(orgIds.toArray(new String[0]));
+                queryParameter.addCriteria(inSet);
+            }
+        }
+        if (roleQueryParameter!=null) {
+            List<RoleEntity> roleList = roleService.list(roleQueryParameter);
+            List<String> roleIds = roleList.stream().map(RoleEntity::getId).collect(Collectors.toList());
+            if (roleList!=null && roleList.size() > 0) {
+                InSet inSet = new InSet();
+                inSet.setFieldName("roles");
+                inSet.setOperator(OperatorType.inSet);
+                inSet.setValue(roleIds.toArray(new String[0]));
+                queryParameter.addCriteria(inSet);
+            }
+        }
+        Page<UserEntity> page = userService.query(queryParameter);
+        if (page.getContent()!=null && page.getContent().size()>0) {
+            List<UserSearchVo> userList = new ArrayList<>();
+            for(UserEntity user: page.getContent()) {
+                UserSearchVo userVo = new UserSearchVo();
+                userVo.setId(user.getId());
+                userVo.setLoginName(user.getLoginName());
+                userVo.setUserName(user.getUserName());
+                userVo.setDescription(user.getDescription());
+                userVo.setEnable(user.getEnable());
+                userVo.setAccountExpired(user.getAccountExpired());
+                userVo.setAccountLocked(user.getAccountLocked());
+                userVo.setCredentialsExpired(user.getCredentialsExpired());
+                userVo.setRoles(roles2listMap(user.getRoles()));
+                userVo.setDefaultRoleId(user.getDefaultRoleId());
+                userVo.setOrgs(orgs2listMap(user.getOrgs()));
+                userVo.setDefaultOrgId(user.getDefaultOrgId());
+                userVo.setDepartments(departments2listMap(user.getDepartments()));
+                userList.add(userVo);
+            }
+            return new PageImpl<UserSearchVo>(userList,page.getPageable(),page.getTotalElements());
+        } else {
+            return Page.empty();
+        }
+    }
+
+    private List<Map<String, String>> roles2listMap(List<RoleEntity> roles) throws Exception {
+        List<Map<String, String>> list = new ArrayList<>();
+        if (roles!=null && roles.size() > 0) {
+            for(RoleEntity role: roles) {
+                Map<String, String> map = new HashMap<>();
+                map.put("id", role.getId());
+                map.put("code", role.getCode());
+                map.put("name", role.getName());
+                list.add(map);
+            }
+        }
+        return list;
+    }
+
+    private List<Map<String, String>> orgs2listMap(List<OrgEntity> orgs) throws Exception {
+        List<Map<String, String>> list = new ArrayList<>();
+        if (orgs!=null && orgs.size() > 0) {
+            for(OrgEntity org: orgs) {
+                Map<String, String> map = new HashMap<>();
+                map.put("id", org.getId());
+                map.put("code", org.getCode());
+                map.put("name", org.getName());
+                list.add(map);
+            }
+        }
+        return list;
+    }
+
+    private List<Map<String, String>> departments2listMap(List<DepartmentEntity> departments) throws Exception {
+        List<Map<String, String>> list = new ArrayList<>();
+        if (departments!=null && departments.size() > 0) {
+            for(DepartmentEntity department: departments) {
+                Map<String, String> map = new HashMap<>();
+                map.put("id", department.getId());
+                map.put("code", department.getCode());
+                map.put("name", department.getName());
+                list.add(map);
+            }
+        }
+        return list;
+    }
+}
diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/support/UserSearchQueryParameter.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/support/UserSearchQueryParameter.java
new file mode 100644
index 00000000..00ecfc45
--- /dev/null
+++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/support/UserSearchQueryParameter.java
@@ -0,0 +1,46 @@
+package io.sc.platform.lcdp.frontend.component.support;
+
+import io.sc.platform.orm.service.support.QueryParameter;
+
+/**
+ * 前端-用户选择组件-用户查询请求入参
+ */
+public class UserSearchQueryParameter {
+
+    /**
+     * 用户列表查询参数
+     */
+    private QueryParameter queryParameter;
+    /**
+     * 机构查询参数
+     */
+    private QueryParameter orgQueryParameter;
+    /**
+     * 角色查询参数
+     */
+    private QueryParameter roleQueryParameter;
+
+    public QueryParameter getQueryParameter() {
+        return queryParameter;
+    }
+
+    public void setQueryParameter(QueryParameter queryParameter) {
+        this.queryParameter = queryParameter;
+    }
+
+    public QueryParameter getOrgQueryParameter() {
+        return orgQueryParameter;
+    }
+
+    public void setOrgQueryParameter(QueryParameter orgQueryParameter) {
+        this.orgQueryParameter = orgQueryParameter;
+    }
+
+    public QueryParameter getRoleQueryParameter() {
+        return roleQueryParameter;
+    }
+
+    public void setRoleQueryParameter(QueryParameter roleQueryParameter) {
+        this.roleQueryParameter = roleQueryParameter;
+    }
+}
diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/vo/UserSearchVo.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/vo/UserSearchVo.java
new file mode 100644
index 00000000..dc6454f4
--- /dev/null
+++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/frontend/component/vo/UserSearchVo.java
@@ -0,0 +1,162 @@
+package io.sc.platform.lcdp.frontend.component.vo;
+
+import io.sc.platform.orm.api.vo.CorporationAuditorVo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class UserSearchVo extends CorporationAuditorVo {
+
+    private String id;
+
+    //登录名
+    private String loginName;
+
+    //用户名
+    private String userName;
+
+    //描述
+    private String description;
+
+    private Boolean enable;
+
+    //账户是否过期
+    private Boolean accountExpired;
+
+    //账户是否被锁定
+    private Boolean accountLocked;
+
+    //密码是否过期
+    private Boolean credentialsExpired;
+
+    //所属角色集合
+    private List<Map<String, String>> roles =new ArrayList<Map<String, String>>();
+
+    //默认所属角色ID
+    private String defaultRoleId;
+
+    //所属机构集合
+    private List<Map<String, String>> orgs =new ArrayList<Map<String, String>>();
+
+    //默认所属机构ID
+    private String defaultOrgId;
+
+    //所属部门集合
+    private List<Map<String, String>> departments =new ArrayList<Map<String, String>>();
+
+    //默认所属部门ID
+    private String defaultDepartmentId;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public Boolean getAccountExpired() {
+        return accountExpired;
+    }
+
+    public void setAccountExpired(Boolean accountExpired) {
+        this.accountExpired = accountExpired;
+    }
+
+    public Boolean getAccountLocked() {
+        return accountLocked;
+    }
+
+    public void setAccountLocked(Boolean accountLocked) {
+        this.accountLocked = accountLocked;
+    }
+
+    public Boolean getCredentialsExpired() {
+        return credentialsExpired;
+    }
+
+    public void setCredentialsExpired(Boolean credentialsExpired) {
+        this.credentialsExpired = credentialsExpired;
+    }
+
+    public List<Map<String, String>> getRoles() {
+        return roles;
+    }
+
+    public void setRoles(List<Map<String, String>> roles) {
+        this.roles = roles;
+    }
+
+    public String getDefaultRoleId() {
+        return defaultRoleId;
+    }
+
+    public void setDefaultRoleId(String defaultRoleId) {
+        this.defaultRoleId = defaultRoleId;
+    }
+
+    public List<Map<String, String>> getOrgs() {
+        return orgs;
+    }
+
+    public void setOrgs(List<Map<String, String>> orgs) {
+        this.orgs = orgs;
+    }
+
+    public String getDefaultOrgId() {
+        return defaultOrgId;
+    }
+
+    public void setDefaultOrgId(String defaultOrgId) {
+        this.defaultOrgId = defaultOrgId;
+    }
+
+    public List<Map<String, String>> getDepartments() {
+        return departments;
+    }
+
+    public void setDepartments(List<Map<String, String>> departments) {
+        this.departments = departments;
+    }
+
+    public String getDefaultDepartmentId() {
+        return defaultDepartmentId;
+    }
+
+    public void setDefaultDepartmentId(String defaultDepartmentId) {
+        this.defaultDepartmentId = defaultDepartmentId;
+    }
+}
diff --git a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json
index 75958b24..b8379972 100644
--- a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json
+++ b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json
@@ -14,7 +14,9 @@
     "io.sc.platform.lcdp.form.controller",
     "io.sc.platform.lcdp.form.service.impl",
     "io.sc.platform.lcdp.excel.template.controller",
-    "io.sc.platform.lcdp.excel.template.service.impl"
+    "io.sc.platform.lcdp.excel.template.service.impl",
+    "io.sc.platform.lcdp.frontend.component.controller",
+    "io.sc.platform.lcdp.frontend.component.service.impl"
   ],
   "excludes":[]
 }
\ No newline at end of file
diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/controller/UserWebController.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/controller/UserWebController.java
index d3b82d92..2f02c5e7 100644
--- a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/controller/UserWebController.java
+++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/controller/UserWebController.java
@@ -243,22 +243,6 @@ public class UserWebController extends RestCrudController<UserVo, UserEntity, St
         return QueryResult.emptyPage();
     }
 
-    /**
-     * 根据机构查询包含的用户（可追加登录号及用户名为查询条件）
-     * @param orgId 机构ID
-     * @param parameter 查询参数
-     * @return 机构包含的用户
-     * @throws Exception 违例
-     */
-    @GetMapping("queryUsersByOrgAndQueryParameter")
-    public Page<UserVo> queryUsersByOrgAndQueryParameter(@RequestParam(name="orgId",required=false) String orgId,QueryParameter parameter) throws Exception{
-        if(StringUtils.hasText(orgId)){
-            Page<UserEntity> result =service.queryUsersByOrgAndQueryParameter(orgId,parameter);
-            return EntityVoUtil.toVo(result);
-        }
-        return QueryResult.emptyPage();
-    }
-
     /**
      * 给用户添加角色
      * @param wrapper 一对多关系(ID关系)封装器, one: 代表用户登录名, many: 代表角色名称集合
diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/UserService.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/UserService.java
index e54aa863..a9760461 100644
--- a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/UserService.java
+++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/UserService.java
@@ -123,15 +123,6 @@ public interface UserService extends DaoService<UserEntity, String, UserReposito
      */
     public Page<UserEntity> queryOtherUsersByCorporation(String corporationCode,QueryParameter queryParameter) throws Exception;
 
-    /**
-     * 根据机构查询包含的用户（可追加登录号及用户名为查询条件）
-     * @param orgId 机构ID
-     * @param queryParameter 查询参数
-     * @return 机构包含的用户
-     * @throws Exception 违例
-     */
-    public Page<UserEntity> queryUsersByOrgAndQueryParameter(String orgId,QueryParameter queryParameter) throws Exception;
-
     /**
      * 给用户添加角色
      * @param userId 用户ID
diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/impl/UserServiceImpl.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/impl/UserServiceImpl.java
index 67746d38..2ef32ae3 100644
--- a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/impl/UserServiceImpl.java
+++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/service/impl/UserServiceImpl.java
@@ -10,6 +10,7 @@ import io.sc.platform.orm.api.exception.UserRawPasswordNotMatchException;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import io.sc.platform.orm.service.support.QueryParameter;
 import io.sc.platform.orm.service.support.QueryResult;
+import io.sc.platform.orm.service.support.criteria.Criteria;
 import io.sc.platform.orm.util.EntityVoUtil;
 import io.sc.platform.security.SecurityProperties;
 import io.sc.platform.security.util.SecurityUtil;
@@ -38,8 +39,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Subquery;
+import javax.persistence.criteria.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.transaction.Transactional;
 import java.sql.PreparedStatement;
@@ -313,52 +313,6 @@ public class UserServiceImpl extends DaoServiceImpl<UserEntity, String, UserRepo
         return QueryResult.emptyPage();
     }
 
-    @Override
-    public Page<UserEntity> queryUsersByOrgAndQueryParameter(String orgId, QueryParameter queryParameter) throws Exception {
-        if(StringUtils.hasText(orgId)) {
-            Specification<UserEntity> specification = (root, query, criteriaBuilder) -> {
-                Subquery<Integer> subquery =query.subquery(Integer.class);
-                Join<UserEntity, OrgEntity> join = subquery.correlate(root).join("orgs");
-
-                subquery.select(criteriaBuilder.literal(1));
-                subquery.where(criteriaBuilder.equal(join.get("id"), orgId));
-
-                return criteriaBuilder.exists(subquery);
-            };
-
-            Specification<UserEntity> loginName = null;
-            Specification<UserEntity> userName = null;
-            if (StringUtils.hasText(queryParameter.getCriteria())) {
-                List<Map<String,String>> criterias = objectMapper.readValue("[" + queryParameter.getCriteria() + "]", new TypeReference<List<Map<String, String>>>() {});
-                List<Map<String,String>> loginNameList = criterias.stream().filter((map) -> {return map.get("fieldName").equals("loginName");}).collect(Collectors.toList());
-                if (loginNameList!=null && loginNameList.size()>0) {
-                    Map<String, String> map = loginNameList.get(0);
-                    loginName = (root, query, criteriaBuilder) -> {
-                        return criteriaBuilder.like(root.get("loginName"), "%"+map.get("value")+"%");
-                    };
-                }
-                List<Map<String,String>> userNameList = criterias.stream().filter((map) -> {return map.get("fieldName").equals("userName");}).collect(Collectors.toList());
-                if (userNameList!=null && userNameList.size()>0) {
-                    Map<String, String> map = userNameList.get(0);
-                    userName = (root, query, criteriaBuilder) -> {
-                        return criteriaBuilder.like(root.get("userName"), "%"+map.get("value")+"%");
-                    };
-                }
-            }
-
-            if (loginName!=null && userName!=null) {
-                return super.query(queryParameter,specification.and(loginName).and(userName));
-            } else if (loginName!=null) {
-                return super.query(queryParameter,specification.and(loginName));
-            } else if (userName!=null) {
-                return super.query(queryParameter,specification.and(userName));
-            } else {
-                return super.query(queryParameter,specification);
-            }
-        }
-        return QueryResult.emptyPage();
-    }
-
     @Override
     @Transactional
     public void addRoles(String userId, Set<String> roleIds) throws Exception {