From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
index 5dad07a..d008e3f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -79,7 +79,7 @@
var deleteShareObj = new DeleteShareObj()
{
shareDatas = funs_Del,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
};
LoadMethod_DelSharedData(deleteShareObj);
@@ -101,7 +101,7 @@
{
shareDatas = funs_NeedAdd,
childAccountIds = childAccountIds,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
};
result = LoadMethod_AddShareData(addShareObj);
@@ -247,7 +247,7 @@
var addShareObj = new AddShareObj()
{
childAccountIds = childAccountIds,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
shareDatas = roomList
};
var responePack = new HttpServerRequest().AddShareData(addShareObj);
@@ -277,7 +277,7 @@
var deleteShareObj = new DeleteShareObj()
{
shareDatas = roomList,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
};
var responePack = new HttpServerRequest().DeleteShareData(deleteShareObj);
if (responePack.Code != StateCode.SUCCESS)
@@ -322,6 +322,7 @@
{
var newSd = new ShareData();
newSd.shareTypeId = roomData.shareTypeId;
+ newSd.shareType = roomData.shareType;
funs_RoomAll.Add(newSd);
}
--
Gitblit v1.8.0