diff --git a/web/App_Code/Model/Partial/family_members.cs b/web/App_Code/Model/Partial/family_members.cs
new file mode 100644
index 0000000..30dd718
--- /dev/null
+++ b/web/App_Code/Model/Partial/family_members.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
+
+///
+/// added
+///
+namespace Model
+{
+ [MetadataType(typeof(family_membersMetadata))]
+ public partial class family_members
+ {
+ private class family_membersMetadata
+ {
+ [JsonIgnore]
+ public virtual follower follower { get; set; }
+ }
+ }
+}
+
diff --git a/web/App_Code/Model/Partial/follower.cs b/web/App_Code/Model/Partial/follower.cs
index 61175b1..6e668b5 100644
--- a/web/App_Code/Model/Partial/follower.cs
+++ b/web/App_Code/Model/Partial/follower.cs
@@ -45,6 +45,19 @@ namespace Model
public virtual ICollection followers_tablet { get; set; }
[JsonIgnore]
public virtual appellation appellation { get; set; }
+ ///
+ /// added
+ ///
+ [JsonIgnore]
+ public virtual ICollection family_members { get; set; }
+ [JsonIgnore]
+ public virtual ICollection transfer_register { get; set; }
+ [JsonIgnore]
+ public virtual ICollection transfer_register1 { get; set; }
+ [JsonIgnore]
+ public virtual ICollection GuaDanOrder { get; set; }
+ [JsonIgnore]
+ public virtual ICollection GuaDanOrderGuest { get; set; }
}
diff --git a/web/App_Code/api/familyMembersController.cs b/web/App_Code/api/familyMembersController.cs
index 48f557d..c464721 100644
--- a/web/App_Code/api/familyMembersController.cs
+++ b/web/App_Code/api/familyMembersController.cs
@@ -98,7 +98,17 @@ public class familyMembersController : ApiController
[Route("api/familymembers/follower/{followerId}")]
public IHttpActionResult GetByFollower(int followerId)
{
+ //var originalLazyLoading = _db.Configuration.LazyLoadingEnabled;
+ //var originalProxyCreation = _db.Configuration.ProxyCreationEnabled;
+//
+ //_db.Configuration.LazyLoadingEnabled = false;
+ //_db.Configuration.ProxyCreationEnabled = false;
+
var familyMembers = _db.family_members.Where(fm => fm.follower_num == followerId).ToList();
+
+ //_db.Configuration.LazyLoadingEnabled = originalLazyLoading;
+ //_db.Configuration.ProxyCreationEnabled = originalProxyCreation;
+
return Ok(familyMembers);
}
diff --git a/web/admin/guadan/create.aspx b/web/admin/guadan/create.aspx
index e0b8a1b..01b8953 100644
--- a/web/admin/guadan/create.aspx
+++ b/web/admin/guadan/create.aspx
@@ -1393,7 +1393,7 @@
message: `確定要將 ${guest.follower.u_name || ''} 退房嗎?`,
onConfirm: async () => {
try {
- const response = await axios.post(`/api/guadanorderguest/checkout`, null, {
+ const response = await axios.post(HTTP_HOST + `/api/guadanorderguest/checkout`, null, {
params: { uuid: guest.uuid }
});
@@ -1594,7 +1594,7 @@
onConfirm: async () => {
try {
// 發送請求到後端 API
- const response = await axios.post(`/api/guadanorderguest/checkin`, null, {
+ const response = await axios.post(HTTP_HOST + `/api/guadanorderguest/checkin`, null, {
params: { uuid: guest.uuid }
});