diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 369f542c8..1acab8b68 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1300,23 +1300,17 @@ - + + + - - - - - - - - + + - - @@ -5583,10 +5577,6 @@ - - - - @@ -6856,16 +6846,9 @@ - - - - - - - @@ -7584,14 +7567,23 @@ - - + + + + + + + + + + - - + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs index bf6e5c0ae..49057ae02 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs @@ -399,36 +399,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } - - - public List GetClassifyTree() - { - try - { - List list = accommodationService.GetClassifyTree(); - List treeList = new List(); - foreach (Acc_DormitoryBuildEntity item in list) - { - TreeModel node = new TreeModel - { - id = item.ID.ToString(), - text = item.Name.ToString(), - value = item.ID.ToString(), - showcheck = false, - checkstate = 0, - isexpand = false, - parentId = item.ParentID == null ? "" : item.ParentID, - title =string.IsNullOrEmpty(item.BuildType)?"":(Convert.ToInt32(item.BuildType)+1).ToString() , - - }; - - - treeList.Add(node); - - - } - - public List GetClassifyTree() { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs index 996dbadde..a1a56b0fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs @@ -1032,7 +1032,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName { try { - this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); UpdateCheckInNum(ParentID); } catch (Exception ex)