diff --git a/src/api/system/user.js b/src/api/system/user.js
index 057ace8c..e3226a36 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -88,6 +88,18 @@ export function changeUserStatus(id, status) {
     data: data
   })
 }
+// 用户白名单修改
+export function changeUserWhiteList(id, whiteList) {
+  const data = {
+    id,
+    whiteList
+  }
+  return request({
+    url: '/system/user/update-whiteList',
+    method: 'put',
+    data: data
+  })
+}
 
 // 查询用户个人信息
 export function getUserProfile() {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0ee1457d..3bcc4a7b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -193,11 +193,29 @@
               />
             </template>
           </el-table-column>
+
+          <el-table-column
+            label="白名单"
+            key="whiteList"
+            v-if="columns[6].visible"
+            align="center"
+          >
+            <template v-slot="scope">
+              <el-switch
+                v-model="scope.row.whiteList"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                :active-value="0"
+                :inactive-value="1"
+                @change="handleWhiteListChange(scope.row)"
+              />
+            </template>
+          </el-table-column>
           <el-table-column
             label="创建时间"
             align="center"
             prop="createTime"
-            v-if="columns[6].visible"
+            v-if="columns[7].visible"
             width="160"
           >
             <template v-slot="scope">
@@ -464,6 +482,7 @@
 import {
   addUser,
   changeUserStatus,
+  changeUserWhiteList,
   delUser,
   exportUser,
   getUser,
@@ -543,6 +562,7 @@ export default {
         username: undefined,
         mobile: undefined,
         status: undefined,
+        whiteList: undefined,
         deptId: undefined,
         createTime: [],
       },
@@ -554,7 +574,8 @@ export default {
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true },
+        { key: 6, label: `白名单`, visible: true },
+        { key: 7, label: `创建时间`, visible: true },
       ],
       // 表单校验
       rules: {
@@ -676,6 +697,27 @@ export default {
               : CommonStatusEnum.ENABLE;
         });
     },
+    // 白名单状态修改
+    handleWhiteListChange(row) {
+      let text = row.whiteList === CommonStatusEnum.ENABLE ? "启用" : "停用";
+      this.$modal
+        .confirm(
+          '确认要"' + text + '""' + row.username + '"用户的token白名单吗?'
+        )
+        .then(function () {
+          return changeUserWhiteList(row.id, row.whiteList);
+        })
+        .then(() => {
+          this.$modal.msgSuccess("token白名单"+text + "成功");
+        })
+        .catch(function () {
+          row.whiteList =
+            row.whiteList === CommonStatusEnum.ENABLE
+              ? CommonStatusEnum.DISABLE
+              : CommonStatusEnum.ENABLE;
+              
+        });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -698,6 +740,7 @@ export default {
         email: undefined,
         sex: undefined,
         status: "0",
+        whiteList: "0",
         remark: undefined,
         postIds: [],
         roleIds: [],