From d75c418daa79cdccfdd4fad51f6a3a57959b3aa0 Mon Sep 17 00:00:00 2001
From: xinyuandd <wwqdd1@126.com>
Date: Wed, 1 Jun 2022 17:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=92=89=E9=92=89=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E7=94=A8=E6=88=B7=E5=88=B0ldap=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=92=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/personnel/group.js          |  8 ++++++++
 src/api/personnel/user.js           | 11 +++++++++--
 src/views/personnel/group/index.vue | 30 ++++++++++++++++-------------
 src/views/personnel/user/index.vue  | 18 ++++++++++++++++-
 4 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/src/api/personnel/group.js b/src/api/personnel/group.js
index adfbd24..449944d 100644
--- a/src/api/personnel/group.js
+++ b/src/api/personnel/group.js
@@ -72,3 +72,11 @@ export function delGroup(data) {
     data
   })
 }
+// 同步钉钉部门信息
+export function syncDingTalkDeptsApi(data) {
+  return request({
+    url: '/api/group/syncDingTalkDepts',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/personnel/user.js b/src/api/personnel/user.js
index 25189d9..ce5b8ac 100644
--- a/src/api/personnel/user.js
+++ b/src/api/personnel/user.js
@@ -26,7 +26,7 @@ export function changePwd(data) {
   })
 }
 
-// 创建用户（已完成） 
+// 创建用户（已完成）
 export function createUser(data) {
   return request({
     url: '/api/user/add',
@@ -51,4 +51,11 @@ export function batchDeleteUserByIds(data) {
     data
   })
 }
-
+// 同步钉钉用户信息
+export function syncDingTalkUsersApi(data) {
+  return request({
+    url: '/api/user/syncDingTalkUsers',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/views/personnel/group/index.vue b/src/views/personnel/group/index.vue
index d328868..2ec8eb0 100644
--- a/src/views/personnel/group/index.vue
+++ b/src/views/personnel/group/index.vue
@@ -20,6 +20,9 @@
         <el-form-item>
           <el-button :disabled="multipleSelection.length === 0" :loading="loading" icon="el-icon-delete" type="danger" @click="batchDelete">批量删除</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button :loading="loading" icon="el-icon-share" type="danger" @click="syncDingTalkDepts">同步钉钉部门</el-button>
+        </el-form-item>
       </el-form>
 
       <el-table v-loading="loading" :default-expand-all="true" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="ID" :data="infoTableData" border stripe style="width: 100%" @selection-change="handleSelectionChange">
@@ -43,18 +46,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <!--tree模式下取消分页选项
-      <el-pagination
-        :current-page="params.pageNum"
-        :page-size="params.pageSize"
-        :total="total"
-        :page-sizes="[1, 5, 10, 30]"
-        layout="total, prev, pager, next, sizes"
-        background
-        style="margin-top: 10px;float:right;margin-bottom: 10px;"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />-->
       <!-- 新增 -->
       <el-dialog :title="dialogFormTitle" :visible.sync="updateLoading">
         <el-form ref="dialogForm" size="small" :model="dialogFormData" :rules="dialogFormRules" label-width="120px">
@@ -104,7 +95,7 @@
 <script>
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { getGroupTree, groupAdd, groupUpdate, groupDel } from '@/api/personnel/group'
+import { getGroupTree, groupAdd, groupUpdate, groupDel, syncDingTalkDeptsApi } from '@/api/personnel/group'
 
 export default {
   name: 'Group',
@@ -401,6 +392,19 @@ export default {
     },
     treeselectInput(value) {
       this.treeselectValue = value
+    },
+    syncDingTalkDepts() {
+      this.loading = true
+      syncDingTalkDeptsApi().then(res => {
+        this.loading = false
+        this.getTableData()
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+      })
+      this.loading = false
     }
   }
 }
diff --git a/src/views/personnel/user/index.vue b/src/views/personnel/user/index.vue
index 81a59dc..dd52d8c 100644
--- a/src/views/personnel/user/index.vue
+++ b/src/views/personnel/user/index.vue
@@ -26,6 +26,9 @@
         <el-form-item>
           <el-button :disabled="multipleSelection.length === 0" :loading="loading" icon="el-icon-delete" type="danger" @click="batchDelete">批量删除</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button :loading="loading" icon="el-icon-share" type="danger" @click="syncDingTalkUsers">同步钉钉用户信息</el-button>
+        </el-form-item>
       </el-form>
 
       <el-table v-loading="loading" :data="tableData" border stripe style="width: 100%" @selection-change="handleSelectionChange">
@@ -176,7 +179,7 @@
 import JSEncrypt from 'jsencrypt'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { getUsers, createUser, updateUserById, batchDeleteUserByIds } from '@/api/personnel/user'
+import { getUsers, createUser, updateUserById, batchDeleteUserByIds, syncDingTalkUsersApi } from '@/api/personnel/user'
 import { getRoles } from '@/api/system/role'
 import { getGroupTree } from '@/api/personnel/group'
 
@@ -616,6 +619,19 @@ wLXapv+ZfsjG7NgdawIDAQAB
       } else {
         this.dialogFormData.departments = this.dialogFormData.departments + ',' + obj.groupName
       }
+    },
+    syncDingTalkUsers(obj) {
+      this.loading = true
+      syncDingTalkUsersApi().then(res => {
+        this.loading = false
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+      })
+      this.getTableData()
+      this.loading = false
     }
   }
 }