From d55f879846c4eba98bc1603c0c656870ad4a64e9 Mon Sep 17 00:00:00 2001
From: yaoyn <cyyz58@163.com>
Date: Wed, 27 Mar 2024 17:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E4=BA=BA=E5=91=98=E6=8C=89=E9=92=AE=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E9=A1=B5=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=94=A8=E6=88=B7=E5=8F=AF=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user/index.ts    | 15 +++++++++++++++
 src/views/system/user/index.vue | 25 +++++++++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 3aeaad5..2995f5b 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -25,6 +25,7 @@ enum Api {
   User = '/organization/user',
   MultiInfo = '/organization/user/info/multi',
   Password = '/organization/user/reset-password',
+  syncOrgAndUser='/organization/syncOrgAndUser/fromDataCenter',
   enabled = '/organization/user/enabled',
   Online = '/organization/user/online-users/page',
   OffOnline = '/organization/user/offline-users',
@@ -107,6 +108,20 @@ export async function resetUserPassword(id: String, mode: ErrorMessageMode = 'mo
     },
   );
 }
+/**
+ * @description: 同步部门人员
+ */
+export async function syncOrgAndUser(source: String, mode: ErrorMessageMode = 'modal') {
+    return defHttp.put(
+        {
+            url: Api.syncOrgAndUser,
+            data: { source },
+        },
+        {
+            errorMessageMode: mode,
+        },
+    );
+}
 
 /**
  * @description: 更新用户
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 77e9dee..bda4bc0 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -6,10 +6,13 @@
         <a-button type="primary" v-auth="'user:add'" @click="handleCreate">{{
           t('新增用户')
         }}</a-button>
-        <a-button type="primary" v-auth="'user:resetPassword'" @click="handleReset">{{
+        <a-button type="default" v-auth="'user:resetPassword'" @click="handleReset">{{
           t('重置密码')
         }}</a-button>
-        <a-button type="primary" v-auth="'user:unlock'" @click="handleLock">
+          <a-button type="default" v-auth="'user:syncOrgAndUser'" @click="handleSync">{{
+              t('同步组织人员')
+          }}</a-button>
+        <a-button type="default" v-auth="'user:unlock'" @click="handleLock">
           {{ lockText }}
         </a-button>
       </template>
@@ -43,7 +46,7 @@
 <script lang="ts">
   import { defineComponent, h, ref, computed } from 'vue';
   import { BasicTable, useTable, TableAction, FormSchema, BasicColumn } from '/@/components/Table';
-  import { getUserPageList, deleteUser, resetUserPassword, userEnabled } from '/@/api/system/user';
+  import { getUserPageList, deleteUser, resetUserPassword, userEnabled, syncOrgAndUser } from '/@/api/system/user';
   import { PageWrapper } from '/@/components/Page';
   import { useMessage } from '/@/hooks/web/useMessage';
 
@@ -54,6 +57,12 @@
   import { Tag } from 'ant-design-vue';
   const { t } = useI18n();
   export const searchFormSchema: FormSchema[] = [
+      {
+          field: 'isSearchAll',
+          label: t('全局搜索'),
+          component: 'Checkbox',
+          colProps: { style:'width:100px;' },
+      },
     {
       field: 'userName',
       label: t('用户名'),
@@ -172,7 +181,7 @@
         },
         beforeFetch: (params) => {
           //发送请求默认新增  左边树结构所选机构id
-          return { ...params, departmentId: selectDeptId.value };
+          return params.isSearchAll?{...params}:{ ...params, departmentId: selectDeptId.value };
         },
         useSearchForm: true,
         showTableSetting: true,
@@ -238,6 +247,13 @@
       function handleCancel() {
         isVisible.value = false;
       }
+      function handleSync(){
+          syncOrgAndUser("fromDataCenter");
+          notification.success({
+              message: t('开始同步组织和人员，请稍后刷新页面查看结果'),
+              description: t('成功'),
+          });
+      }
       function handleReset() {
         if (process.env.NODE_ENV === 'production') {
           notification.warning({
@@ -301,6 +317,7 @@
         handleSuccess,
         handleSelect,
         handleReset,
+        handleSync,
         handleLock,
         lockText,
         handleCancel,