From 189381c5fa935c35153fe3601765e434af933a0f Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 18 May 2023 10:59:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=BA=E6=99=AF=E8=81=94=E5=8A=A8-?=
 =?UTF-8?q?=E6=94=B6=E4=BF=A1=E4=BA=BA=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scene/Save/action/Notify/variableItem/User.vue       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
index 923c4e9d..1016aec4 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
@@ -272,14 +272,15 @@ const getUser = async (_source: string, _triggerType: string) => {
             key: 'p2',
             selectable: false,
             children: relationResp.result.map((item: any) => {
-              treeDataMap.set(item.id, item)
-                return {
+                const obj = {
                     ...item,
                     value: item.id,
                     key: item.id,
                     title: item.name,
                     isRelation: true,
-                };
+                }
+                treeDataMap.set(item.id, obj)
+                return obj
             }),
         });
     }
@@ -306,7 +307,7 @@ const getObj = (
                 objectType: 'device',
                 objectSource: {
                     source: 'upper',
-                    upperKey: 'deviceId',
+                    upperKey: 'scene.deviceId',
                 },
                 related: {
                     objectType: 'user',