diff --git a/src/api/access.js b/src/api/access.js
index a5b5342..aea0671 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -56,6 +56,18 @@
   })
 }
 
+// 取消授权
+export function delAllPermission(doorCode,personType) {
+  return request({
+    url: 'acsPermission/deleteAll',
+    method: 'post',
+    params: {
+      doorCode: doorCode,
+      personType: personType
+    }
+  })
+}
+
 // 查询员工列表
 export function getStaffList(params) {
   return request({

diff --git a/src/api/access.js b/src/api/access.js
index a5b5342..aea0671 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -56,6 +56,18 @@
   })
 }
 
+// 取消授权
+export function delAllPermission(doorCode,personType) {
+  return request({
+    url: 'acsPermission/deleteAll',
+    method: 'post',
+    params: {
+      doorCode: doorCode,
+      personType: personType
+    }
+  })
+}
+
 // 查询员工列表
 export function getStaffList(params) {
   return request({
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 7ce5362..d058b79 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -4,7 +4,7 @@
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="false" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -113,6 +113,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -121,7 +122,11 @@
             this.$message.success('新增门禁授权成功')
             this.canEdit = true
             this.cancel()
+          } else {
+            this.canEdit = true
           }
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },

diff --git a/src/api/access.js b/src/api/access.js
index a5b5342..aea0671 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -56,6 +56,18 @@
   })
 }
 
+// 取消授权
+export function delAllPermission(doorCode,personType) {
+  return request({
+    url: 'acsPermission/deleteAll',
+    method: 'post',
+    params: {
+      doorCode: doorCode,
+      personType: personType
+    }
+  })
+}
+
 // 查询员工列表
 export function getStaffList(params) {
   return request({
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 7ce5362..d058b79 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -4,7 +4,7 @@
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="false" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -113,6 +113,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -121,7 +122,11 @@
             this.$message.success('新增门禁授权成功')
             this.canEdit = true
             this.cancel()
+          } else {
+            this.canEdit = true
           }
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 6b71b5a..5cab2bf 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -102,6 +102,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -111,6 +112,8 @@
             this.cancel()
           }
           this.canEdit = true
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },

diff --git a/src/api/access.js b/src/api/access.js
index a5b5342..aea0671 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -56,6 +56,18 @@
   })
 }
 
+// 取消授权
+export function delAllPermission(doorCode,personType) {
+  return request({
+    url: 'acsPermission/deleteAll',
+    method: 'post',
+    params: {
+      doorCode: doorCode,
+      personType: personType
+    }
+  })
+}
+
 // 查询员工列表
 export function getStaffList(params) {
   return request({
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 7ce5362..d058b79 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -4,7 +4,7 @@
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="false" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -113,6 +113,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -121,7 +122,11 @@
             this.$message.success('新增门禁授权成功')
             this.canEdit = true
             this.cancel()
+          } else {
+            this.canEdit = true
           }
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 6b71b5a..5cab2bf 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -102,6 +102,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -111,6 +112,8 @@
             this.cancel()
           }
           this.canEdit = true
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 207ea77..db80ed4 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -23,6 +23,7 @@
           <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
           <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelPermission">取消员工授权</el-button>
+          <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelAllPermission">一键取消全部授权</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -61,7 +62,7 @@
 </template>
 
 <script>
-import { getStaffPermissionByDoor, delPermission, exportStaffPermission } from '@/api/access'
+import { getStaffPermissionByDoor, delPermission, delAllPermission, exportStaffPermission } from '@/api/access'
 import DeptSelect from '../../components/DeptSelect/index'
 import AddStaffPerm from './addStaffPerm'
 import EditStrategy from '../accessStrategy/editStrategy'
@@ -181,6 +182,30 @@
         this.$message.error('至少选中一项')
       }
     },
+    // 取消全部授权
+    cancelAllPermission() {
+      this.$confirm(
+        '确认取消该门禁上的全部员工授权吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.listLoading = true
+        delAllPermission(this.listQuery.doorCode, '1').then(response => {
+          if (response.code === 200) {
+            this.$message.success('取消授权成功')
+            this.fetchData()
+            this.listLoading = false
+          }
+        }).catch(res => {
+          this.fetchData()
+          this.listLoading = false
+        })
+      })
+    },
     // 新增授权
     addPermission() {
       this.$refs.staffperm.initDialog(this.listQuery.doorCode)

diff --git a/src/api/access.js b/src/api/access.js
index a5b5342..aea0671 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -56,6 +56,18 @@
   })
 }
 
+// 取消授权
+export function delAllPermission(doorCode,personType) {
+  return request({
+    url: 'acsPermission/deleteAll',
+    method: 'post',
+    params: {
+      doorCode: doorCode,
+      personType: personType
+    }
+  })
+}
+
 // 查询员工列表
 export function getStaffList(params) {
   return request({
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 7ce5362..d058b79 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -4,7 +4,7 @@
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="false" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -113,6 +113,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -121,7 +122,11 @@
             this.$message.success('新增门禁授权成功')
             this.canEdit = true
             this.cancel()
+          } else {
+            this.canEdit = true
           }
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 6b71b5a..5cab2bf 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -102,6 +102,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -111,6 +112,8 @@
             this.cancel()
           }
           this.canEdit = true
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 207ea77..db80ed4 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -23,6 +23,7 @@
           <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
           <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelPermission">取消员工授权</el-button>
+          <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelAllPermission">一键取消全部授权</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -61,7 +62,7 @@
 </template>
 
 <script>
-import { getStaffPermissionByDoor, delPermission, exportStaffPermission } from '@/api/access'
+import { getStaffPermissionByDoor, delPermission, delAllPermission, exportStaffPermission } from '@/api/access'
 import DeptSelect from '../../components/DeptSelect/index'
 import AddStaffPerm from './addStaffPerm'
 import EditStrategy from '../accessStrategy/editStrategy'
@@ -181,6 +182,30 @@
         this.$message.error('至少选中一项')
       }
     },
+    // 取消全部授权
+    cancelAllPermission() {
+      this.$confirm(
+        '确认取消该门禁上的全部员工授权吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.listLoading = true
+        delAllPermission(this.listQuery.doorCode, '1').then(response => {
+          if (response.code === 200) {
+            this.$message.success('取消授权成功')
+            this.fetchData()
+            this.listLoading = false
+          }
+        }).catch(res => {
+          this.fetchData()
+          this.listLoading = false
+        })
+      })
+    },
     // 新增授权
     addPermission() {
       this.$refs.staffperm.initDialog(this.listQuery.doorCode)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 06b623f..a81cbe7 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -20,6 +20,7 @@
           <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
           <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelPermission">取消访客授权</el-button>
+          <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelAllPermission">一键取消全部授权</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -58,7 +59,7 @@
 </template>
 
 <script>
-import { getVisitorPermissionByDoor, delPermission, exportVisitorPermission } from '@/api/access'
+import { getVisitorPermissionByDoor, delPermission, delAllPermission, exportVisitorPermission } from '@/api/access'
 import AddVisitorPerm from './addVisitorPerm'
 import EditStrategy from '../accessStrategy/editStrategy'
 import { downloadFile } from '@/utils/downloadUtils'
@@ -145,7 +146,7 @@
       if (this.checkSelection()) {
         const permissionIds = []
         this.multipleSelection.forEach(function(value, index) {
-          permissionIds.push(value.id)
+          permissionIds.push(value.permissionId)
         })
         this.$confirm(
           '确认取消该访客的门禁授权吗？',
@@ -156,17 +157,46 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPermission(permissionIds).then(response => {
             if (response.code === 200) {
               this.$message.success('取消授权成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {
         this.$message.error('至少选中一项')
       }
     },
+    // 取消全部授权
+    cancelAllPermission() {
+      this.$confirm(
+        '确认取消该门禁上的全部访客授权吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.listLoading = true
+        delAllPermission(this.listQuery.doorCode, '0').then(response => {
+          if (response.code === 200) {
+            this.$message.success('取消授权成功')
+            this.fetchData()
+            this.listLoading = false
+          }
+        }).catch(res => {
+          this.fetchData()
+          this.listLoading = false
+        })
+      })
+    },
     // 新增授权
     addPermission() {
       this.$refs.visitorperm.initDialog(this.listQuery.doorCode)

diff --git a/src/api/access.js b/src/api/access.js
index a5b5342..aea0671 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -56,6 +56,18 @@
   })
 }
 
+// 取消授权
+export function delAllPermission(doorCode,personType) {
+  return request({
+    url: 'acsPermission/deleteAll',
+    method: 'post',
+    params: {
+      doorCode: doorCode,
+      personType: personType
+    }
+  })
+}
+
 // 查询员工列表
 export function getStaffList(params) {
   return request({
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 7ce5362..d058b79 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -4,7 +4,7 @@
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="false" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -113,6 +113,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -121,7 +122,11 @@
             this.$message.success('新增门禁授权成功')
             this.canEdit = true
             this.cancel()
+          } else {
+            this.canEdit = true
           }
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 6b71b5a..5cab2bf 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -102,6 +102,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -111,6 +112,8 @@
             this.cancel()
           }
           this.canEdit = true
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 207ea77..db80ed4 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -23,6 +23,7 @@
           <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
           <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelPermission">取消员工授权</el-button>
+          <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelAllPermission">一键取消全部授权</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -61,7 +62,7 @@
 </template>
 
 <script>
-import { getStaffPermissionByDoor, delPermission, exportStaffPermission } from '@/api/access'
+import { getStaffPermissionByDoor, delPermission, delAllPermission, exportStaffPermission } from '@/api/access'
 import DeptSelect from '../../components/DeptSelect/index'
 import AddStaffPerm from './addStaffPerm'
 import EditStrategy from '../accessStrategy/editStrategy'
@@ -181,6 +182,30 @@
         this.$message.error('至少选中一项')
       }
     },
+    // 取消全部授权
+    cancelAllPermission() {
+      this.$confirm(
+        '确认取消该门禁上的全部员工授权吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.listLoading = true
+        delAllPermission(this.listQuery.doorCode, '1').then(response => {
+          if (response.code === 200) {
+            this.$message.success('取消授权成功')
+            this.fetchData()
+            this.listLoading = false
+          }
+        }).catch(res => {
+          this.fetchData()
+          this.listLoading = false
+        })
+      })
+    },
     // 新增授权
     addPermission() {
       this.$refs.staffperm.initDialog(this.listQuery.doorCode)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 06b623f..a81cbe7 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -20,6 +20,7 @@
           <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
           <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelPermission">取消访客授权</el-button>
+          <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelAllPermission">一键取消全部授权</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -58,7 +59,7 @@
 </template>
 
 <script>
-import { getVisitorPermissionByDoor, delPermission, exportVisitorPermission } from '@/api/access'
+import { getVisitorPermissionByDoor, delPermission, delAllPermission, exportVisitorPermission } from '@/api/access'
 import AddVisitorPerm from './addVisitorPerm'
 import EditStrategy from '../accessStrategy/editStrategy'
 import { downloadFile } from '@/utils/downloadUtils'
@@ -145,7 +146,7 @@
       if (this.checkSelection()) {
         const permissionIds = []
         this.multipleSelection.forEach(function(value, index) {
-          permissionIds.push(value.id)
+          permissionIds.push(value.permissionId)
         })
         this.$confirm(
           '确认取消该访客的门禁授权吗？',
@@ -156,17 +157,46 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPermission(permissionIds).then(response => {
             if (response.code === 200) {
               this.$message.success('取消授权成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {
         this.$message.error('至少选中一项')
       }
     },
+    // 取消全部授权
+    cancelAllPermission() {
+      this.$confirm(
+        '确认取消该门禁上的全部访客授权吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.listLoading = true
+        delAllPermission(this.listQuery.doorCode, '0').then(response => {
+          if (response.code === 200) {
+            this.$message.success('取消授权成功')
+            this.fetchData()
+            this.listLoading = false
+          }
+        }).catch(res => {
+          this.fetchData()
+          this.listLoading = false
+        })
+      })
+    },
     // 新增授权
     addPermission() {
       this.$refs.visitorperm.initDialog(this.listQuery.doorCode)
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index c190218..f4af3c7 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/src/api/access.js b/src/api/access.js
index a5b5342..aea0671 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -56,6 +56,18 @@
   })
 }
 
+// 取消授权
+export function delAllPermission(doorCode,personType) {
+  return request({
+    url: 'acsPermission/deleteAll',
+    method: 'post',
+    params: {
+      doorCode: doorCode,
+      personType: personType
+    }
+  })
+}
+
 // 查询员工列表
 export function getStaffList(params) {
   return request({
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 7ce5362..d058b79 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -4,7 +4,7 @@
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="false" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -113,6 +113,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -121,7 +122,11 @@
             this.$message.success('新增门禁授权成功')
             this.canEdit = true
             this.cancel()
+          } else {
+            this.canEdit = true
           }
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 6b71b5a..5cab2bf 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -102,6 +102,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -111,6 +112,8 @@
             this.cancel()
           }
           this.canEdit = true
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 207ea77..db80ed4 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -23,6 +23,7 @@
           <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
           <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelPermission">取消员工授权</el-button>
+          <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelAllPermission">一键取消全部授权</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -61,7 +62,7 @@
 </template>
 
 <script>
-import { getStaffPermissionByDoor, delPermission, exportStaffPermission } from '@/api/access'
+import { getStaffPermissionByDoor, delPermission, delAllPermission, exportStaffPermission } from '@/api/access'
 import DeptSelect from '../../components/DeptSelect/index'
 import AddStaffPerm from './addStaffPerm'
 import EditStrategy from '../accessStrategy/editStrategy'
@@ -181,6 +182,30 @@
         this.$message.error('至少选中一项')
       }
     },
+    // 取消全部授权
+    cancelAllPermission() {
+      this.$confirm(
+        '确认取消该门禁上的全部员工授权吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.listLoading = true
+        delAllPermission(this.listQuery.doorCode, '1').then(response => {
+          if (response.code === 200) {
+            this.$message.success('取消授权成功')
+            this.fetchData()
+            this.listLoading = false
+          }
+        }).catch(res => {
+          this.fetchData()
+          this.listLoading = false
+        })
+      })
+    },
     // 新增授权
     addPermission() {
       this.$refs.staffperm.initDialog(this.listQuery.doorCode)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 06b623f..a81cbe7 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -20,6 +20,7 @@
           <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
           <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelPermission">取消访客授权</el-button>
+          <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelAllPermission">一键取消全部授权</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -58,7 +59,7 @@
 </template>
 
 <script>
-import { getVisitorPermissionByDoor, delPermission, exportVisitorPermission } from '@/api/access'
+import { getVisitorPermissionByDoor, delPermission, delAllPermission, exportVisitorPermission } from '@/api/access'
 import AddVisitorPerm from './addVisitorPerm'
 import EditStrategy from '../accessStrategy/editStrategy'
 import { downloadFile } from '@/utils/downloadUtils'
@@ -145,7 +146,7 @@
       if (this.checkSelection()) {
         const permissionIds = []
         this.multipleSelection.forEach(function(value, index) {
-          permissionIds.push(value.id)
+          permissionIds.push(value.permissionId)
         })
         this.$confirm(
           '确认取消该访客的门禁授权吗？',
@@ -156,17 +157,46 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPermission(permissionIds).then(response => {
             if (response.code === 200) {
               this.$message.success('取消授权成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {
         this.$message.error('至少选中一项')
       }
     },
+    // 取消全部授权
+    cancelAllPermission() {
+      this.$confirm(
+        '确认取消该门禁上的全部访客授权吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.listLoading = true
+        delAllPermission(this.listQuery.doorCode, '0').then(response => {
+          if (response.code === 200) {
+            this.$message.success('取消授权成功')
+            this.fetchData()
+            this.listLoading = false
+          }
+        }).catch(res => {
+          this.fetchData()
+          this.listLoading = false
+        })
+      })
+    },
     // 新增授权
     addPermission() {
       this.$refs.visitorperm.initDialog(this.listQuery.doorCode)
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index c190218..f4af3c7 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 8c4665c..72d86ec 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -47,7 +47,7 @@
           </el-upload>
           <download-template v-if="attendanceEnable" ref="downloadTemplate" :filename="filename" />
           <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-          <!--<el-button class="edit_btn" size="small" @click="updateData">虹膜数据下发</el-button>-->
+          <el-button class="edit_btn" size="small" @click="updateData">虹膜数据下发</el-button>
           <el-button class="edit_btn" size="small" @click="updateFace">人脸数据下发</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>

diff --git a/src/api/access.js b/src/api/access.js
index a5b5342..aea0671 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -56,6 +56,18 @@
   })
 }
 
+// 取消授权
+export function delAllPermission(doorCode,personType) {
+  return request({
+    url: 'acsPermission/deleteAll',
+    method: 'post',
+    params: {
+      doorCode: doorCode,
+      personType: personType
+    }
+  })
+}
+
 // 查询员工列表
 export function getStaffList(params) {
   return request({
diff --git a/src/views/accessPermission/addStaffPerm.vue b/src/views/accessPermission/addStaffPerm.vue
index 7ce5362..d058b79 100644
--- a/src/views/accessPermission/addStaffPerm.vue
+++ b/src/views/accessPermission/addStaffPerm.vue
@@ -4,7 +4,7 @@
     <!--策略名称-->
     <el-row :gutter="20">
       <el-col :span="8">
-        <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="选择部门"/>
+        <dept-select v-model="listQuery.deptId" :need-top="false" :dept-show="true" placeholder="选择部门"/>
       </el-col>
       <el-col :span="8">
         <el-input v-model.trim="listQuery.keyword" type="text" placeholder="姓名/身份证号"/>
@@ -113,6 +113,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -121,7 +122,11 @@
             this.$message.success('新增门禁授权成功')
             this.canEdit = true
             this.cancel()
+          } else {
+            this.canEdit = true
           }
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/addVisitorPerm.vue b/src/views/accessPermission/addVisitorPerm.vue
index 6b71b5a..5cab2bf 100644
--- a/src/views/accessPermission/addVisitorPerm.vue
+++ b/src/views/accessPermission/addVisitorPerm.vue
@@ -102,6 +102,7 @@
       if (this.validateForm(this.permissionForm)) {
         this.canEdit = false
         const permissionForm = this.permissionForm
+        permissionForm.personList = []
         this.multipleSelection.forEach((item) => {
           permissionForm.personList.push(item.id)
         })
@@ -111,6 +112,8 @@
             this.cancel()
           }
           this.canEdit = true
+        }).catch(() => {
+          this.canEdit = true
         })
       }
     },
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index 207ea77..db80ed4 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -23,6 +23,7 @@
           <el-button v-if="hasPerm('/acsPermission/exportStaffPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增员工授权</el-button>
           <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelPermission">取消员工授权</el-button>
+          <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelAllPermission">一键取消全部授权</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -61,7 +62,7 @@
 </template>
 
 <script>
-import { getStaffPermissionByDoor, delPermission, exportStaffPermission } from '@/api/access'
+import { getStaffPermissionByDoor, delPermission, delAllPermission, exportStaffPermission } from '@/api/access'
 import DeptSelect from '../../components/DeptSelect/index'
 import AddStaffPerm from './addStaffPerm'
 import EditStrategy from '../accessStrategy/editStrategy'
@@ -181,6 +182,30 @@
         this.$message.error('至少选中一项')
       }
     },
+    // 取消全部授权
+    cancelAllPermission() {
+      this.$confirm(
+        '确认取消该门禁上的全部员工授权吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.listLoading = true
+        delAllPermission(this.listQuery.doorCode, '1').then(response => {
+          if (response.code === 200) {
+            this.$message.success('取消授权成功')
+            this.fetchData()
+            this.listLoading = false
+          }
+        }).catch(res => {
+          this.fetchData()
+          this.listLoading = false
+        })
+      })
+    },
     // 新增授权
     addPermission() {
       this.$refs.staffperm.initDialog(this.listQuery.doorCode)
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 06b623f..a81cbe7 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -20,6 +20,7 @@
           <el-button v-if="hasPerm('/acsPermission/exportVisitorPerm')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出授权记录</el-button>
           <el-button v-if="hasPerm('/acsPermission/add')" class="edit_btn" size="small" @click="addPermission">新增访客授权</el-button>
           <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelPermission">取消访客授权</el-button>
+          <el-button v-if="hasPerm('/acsPermission/delete')" class="edit_btn" size="small" @click="cancelAllPermission">一键取消全部授权</el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -58,7 +59,7 @@
 </template>
 
 <script>
-import { getVisitorPermissionByDoor, delPermission, exportVisitorPermission } from '@/api/access'
+import { getVisitorPermissionByDoor, delPermission, delAllPermission, exportVisitorPermission } from '@/api/access'
 import AddVisitorPerm from './addVisitorPerm'
 import EditStrategy from '../accessStrategy/editStrategy'
 import { downloadFile } from '@/utils/downloadUtils'
@@ -145,7 +146,7 @@
       if (this.checkSelection()) {
         const permissionIds = []
         this.multipleSelection.forEach(function(value, index) {
-          permissionIds.push(value.id)
+          permissionIds.push(value.permissionId)
         })
         this.$confirm(
           '确认取消该访客的门禁授权吗？',
@@ -156,17 +157,46 @@
             type: 'warning'
           }
         ).then(() => {
+          this.listLoading = true
           delPermission(permissionIds).then(response => {
             if (response.code === 200) {
               this.$message.success('取消授权成功')
               this.fetchData()
+              this.listLoading = false
             }
+          }).catch(() => {
+            this.fetchData()
+            this.listLoading = false
           })
         })
       } else {
         this.$message.error('至少选中一项')
       }
     },
+    // 取消全部授权
+    cancelAllPermission() {
+      this.$confirm(
+        '确认取消该门禁上的全部访客授权吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.listLoading = true
+        delAllPermission(this.listQuery.doorCode, '0').then(response => {
+          if (response.code === 200) {
+            this.$message.success('取消授权成功')
+            this.fetchData()
+            this.listLoading = false
+          }
+        }).catch(res => {
+          this.fetchData()
+          this.listLoading = false
+        })
+      })
+    },
     // 新增授权
     addPermission() {
       this.$refs.visitorperm.initDialog(this.listQuery.doorCode)
diff --git a/src/views/doorManage/editDoor.vue b/src/views/doorManage/editDoor.vue
index c190218..f4af3c7 100644
--- a/src/views/doorManage/editDoor.vue
+++ b/src/views/doorManage/editDoor.vue
@@ -18,7 +18,7 @@
       <el-row type="flex" justify="center">
         <el-col :span="18">
           <el-form-item label="单位" prop="deptid">
-            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择单位"/>
+            <dept-select v-model="doorForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" placeholder="选择单位"/>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 8c4665c..72d86ec 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -47,7 +47,7 @@
           </el-upload>
           <download-template v-if="attendanceEnable" ref="downloadTemplate" :filename="filename" />
           <el-button v-if="hasPerm('/records/exportStaff')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-          <!--<el-button class="edit_btn" size="small" @click="updateData">虹膜数据下发</el-button>-->
+          <el-button class="edit_btn" size="small" @click="updateData">虹膜数据下发</el-button>
           <el-button class="edit_btn" size="small" @click="updateFace">人脸数据下发</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index fc44b45..cfb9020 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -33,7 +33,7 @@
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button v-if="hasPerm('/records/exportVisitor')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-          <!--<el-button class="edit_btn" size="small" @click="updateData">虹膜数据下发</el-button>-->
+          <el-button class="edit_btn" size="small" @click="updateData">虹膜数据下发</el-button>
           <el-button class="edit_btn" size="small" @click="updateFace">人脸数据下发</el-button>
           <el-button v-if="hasPerm('/staff/delete')" class="edit_btn" size="small" @click="del">删除</el-button>
           <el-button v-if="hasPerm('/staff/add')" class="edit_btn" size="small" @click="add">新增</el-button>