From 488cf7d591dc7400ed5c7f116af7005396c666e2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 03 一月 2024 17:12:17 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-Branch-2024
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 1957662..7d2996e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -1311,27 +1311,30 @@
if (indexeList.Count > 0)
{
dicSateteList.Clear();
- string s = string.Empty;
+ string userNameStr = string.Empty;
+ string seleUsrIdStr = string.Empty;
string tag = string.Empty;
- //鏁版嵁灏佽
+ string[] arrayUserIds = new string[indexeList.Count];
+ //寮�闂ㄧ被鍨�
AddDictionary("open_type", "1", "integer");
for (int i = 0; i < indexeList.Count; i++)
{
-
if (i > faceIdList.Count)
{
continue;
}
var indexe = indexeList[i];
var face = faceIdList[indexe];
- AddDictionary("user_id", face.userId, "string");
- s += face.userName;
- s += ",";
tag += face.userId;
tag += "_";
+ userNameStr += face.userName;
+ userNameStr += ",";
+ arrayUserIds[i] = face.userId;
}
+ seleUsrIdStr = Newtonsoft.Json.JsonConvert.SerializeObject(arrayUserIds);
+ AddDictionary("user_id", seleUsrIdStr, "string", "[]");
//鐣岄潰鏄剧ず閫変腑鍊�
- btnState.Text = s;
+ btnState.Text = InpOrOutLogicMethod.Current.RemoveLastStr(userNameStr);
btnState.Tag = tag;
}
--
Gitblit v1.8.0