From c6402221a27aab8dfdac6e08967041e0c5009612 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 13 四月 2023 16:04:15 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index ea5a613..18e1a35 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -1142,7 +1142,7 @@
{
loading.Hide();
- string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
+ string stateValue = btnState.Text == null ? "" : btnState.Text.ToString();
PublicInterface publicInterface = new PublicInterface();
publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
{
@@ -1158,8 +1158,9 @@
continue;
}
var face = faceIdList[indexe];
- //鏁版嵁灏佽
- AddDictionary("open_user", face.userId, "string");
+
+ //鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
+ AddDictionary("open_user", face.userName, "string");
s += face.userName;
s += ",";
tag += face.userId;
--
Gitblit v1.8.0