From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
index d2d4498..ad3c548 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -15,7 +15,6 @@
LoadEvent_OptionClick();
}
-
/// <summary>
/// 搴曢儴鎿嶄綔鎸夐挳鐐瑰嚮浜嬩欢
/// </summary>
@@ -43,7 +42,7 @@
//濡傛灉璇ュ姛鑳藉凡缁忓垎浜紝鏇存柊鍘熸湁鐨勬暟鎹�
if (null != sd)
{
- sd.ShareDataBytes = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
+ sd.ShareDataBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
result = EditShareData(sd);
}
else//濡傛灉璇ュ姛鑳芥湭琚垎浜紝鍒欐柊澧炲垎浜�
@@ -82,7 +81,7 @@
}
else
{
- //var sharedBytes = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
+ //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
var page = new ChooseShareMemberTargetListPage(funs_New);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -168,12 +167,12 @@
var newSd = new ShareData();
newSd.ShareName = function.sid;
newSd.HouseDistributedMark = DB_ResidenceData.residenceData.residecenInfo.RegionID;
- newSd.ShareDataBytes = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(function));
+ newSd.ShareDataBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(function));
newSd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
funs_New.Add(newSd);
}
btnChooseAll.IsSelected = true;
- foreach (var f in room.functions)
+ foreach (var f in room.GetRoomFunctions(false))
{
if (funs_New.Find((obj) => obj.ShareName == f.sid) == null)
{
@@ -221,19 +220,19 @@
funs_New = new List<ShareData>();
if (btnChooseAll.IsSelected)
{
- foreach(var f in room.functions)
+ foreach(var f in room.GetRoomFunctions(false))
{
var ssdd = new ShareData();
ssdd.ShareName = f.sid;
ssdd.HouseDistributedMark = DB_ResidenceData.residenceData.residecenInfo.RegionID;
- ssdd.ShareDataBytes = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
+ ssdd.ShareDataBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
ssdd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
funs_New.Add(ssdd);
}
}
else
{
- foreach(var f in room.functions)
+ foreach(var f in room.GetRoomFunctions(false))
{
var sd = funs.Find((obj) => obj.ShareName == f.sid);
if (sd != null)
--
Gitblit v1.8.0