From cf36e34e4f2fc1c6ff33fec4993d61c51b910e3f Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 16 Mar 2023 11:50:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#10389=E3=80=8110421?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/Home/index.vue             |  4 +++-
 src/views/notice/Config/SyncUser/index.vue | 26 +++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/views/media/Home/index.vue b/src/views/media/Home/index.vue
index 5bf74e50..4385da6a 100644
--- a/src/views/media/Home/index.vue
+++ b/src/views/media/Home/index.vue
@@ -25,7 +25,7 @@
         <!-- 选择设备 -->
         <j-modal
             title="选择设备"
-            width="800px"
+            width="850px"
             v-model:visible="visible"
             :maskClosable="false"
             :destroyOnClose="true"
@@ -57,6 +57,7 @@
                         deviceItem = record;
                     }
                 }"
+                :alertRender="false"
                 :pagination="{
                     showSizeChanger: true,
                     pageSizeOptions: ['10', '20', '50', '100'],
@@ -160,6 +161,7 @@ const columns = [
         key: 'id',
         search: {
             type: 'string',
+            defaultTermType: 'eq',
         },
     },
     {
diff --git a/src/views/notice/Config/SyncUser/index.vue b/src/views/notice/Config/SyncUser/index.vue
index abff0115..d8a8c1b9 100644
--- a/src/views/notice/Config/SyncUser/index.vue
+++ b/src/views/notice/Config/SyncUser/index.vue
@@ -316,15 +316,10 @@ const getBindUsers = async () => {
  * 获取所有用户未绑定的用户
  */
 const allUserList = ref([]);
-const getAllUsers = async () => {
+const getAllUsers = async (terms?: any) => {
     const params = {
         paging: false,
-        terms: [
-            {
-                column: `id$user-third$${props.data.type}_${props.data.provider}$not`,
-                value: props.data.id,
-            },
-        ],
+        terms,
     };
     const { result } = await configApi.getPlatformUsers(params);
     allUserList.value = result.map((m: any) => ({
@@ -355,11 +350,11 @@ const getTableData = () => {
                 const bindUser = bindUsers.find(
                     (f: any) => f.thirdPartyUserId === deptUser.id,
                 );
-                // if (bindUser) {
-                //     unBindUser = unBindUsers.find(
-                //         (f: any) => f.id === bindUser.userId,
-                //     );
-                // }
+                if (bindUser) {
+                    unBindUser = unBindUsers.find(
+                        (f: any) => f.id === bindUser.userId,
+                    );
+                }
                 dataSource.value.push({
                     thirdPartyUserId: deptUser.id,
                     thirdPartyUserName: deptUser.name,
@@ -422,7 +417,12 @@ const handleBind = (row: any) => {
     bindVis.value = true;
     // formData.value = row;
     Object.assign(formData.value, row);
-    getAllUsers();
+    getAllUsers([
+        {
+            column: `id$user-third$${props.data.type}_${props.data.provider}$not`,
+            // value: props.data.id,
+        },
+    ]);
 };
 
 /**