diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs
index 7dc28ac73..8fbc5129e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs	
@@ -207,6 +207,8 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         {
             return View();
         }
+
+
         #endregion
 
         #region  获取数据
@@ -244,7 +246,27 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             var data = accommodationIBLL.GetBedListByRoomId(RoomId).OrderBy(x => x.DNo);
             return Success(data);
         }
-
+        /// <summary>
+        /// 获取分类数据
+        /// <summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassifyList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = accommodationIBLL.GetClassifyList(paginationobj,queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        
         /// <summary>
         /// 获取宿舍楼数据
         /// </summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js
index 0837a154c..402a3152c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js	
@@ -247,7 +247,7 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
                     if (keyValue.indexOf(',') != -1) {
-                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        learun.alert.warning("只能选择一条记录！");
                         return false;
                     }
                     learun.layerForm({
@@ -264,7 +264,21 @@ var bootstrap = function ($, learun) {
                 
 
             });
-
+            
+            //分类管理
+            $("#lr_Classify").on("click", function () {
+                learun.layerForm({
+                    id: 'indexBed',
+                    title: '分类管理',
+                    url: top.$.rootUrl + '/LogisticsManagement/Accommodation/IndexClassify',
+                    width: 1200,
+                    height: 780,
+                    btn:null,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
         },
         //初始化左侧树
         initTree: function () {
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 eb5218731..369f542c8 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,6 +1300,7 @@
     <Content Include="Areas\EducationalAdministration\Views\TeachPlan\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\TeachSwitch\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\TeachSwitch\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClassify.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormBed.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormRoom.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClass.js" />
@@ -1311,6 +1312,7 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormDept.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\Allocation.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\DormitoryAdd.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.js" />
@@ -7588,6 +7590,8 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormRoom.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormBed.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormClassify.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
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 6e64aeadc..fcff22718 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	
@@ -402,6 +402,34 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         }
 
         
+        public List<TreeModel> GetClassifyTree()
+        {
+            try
+            {
+                List<Acc_DormitoryBuildEntity> list = accommodationService.GetClassifyTree();
+                List<TreeModel> treeList = new List<TreeModel>();
+                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<TreeModel> 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 106eadc10..d24c3b099 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	
@@ -170,7 +170,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
                         strSql.Append(" AND t.CheckInStu>0 ");
                     }
                 }
-                
+
                 if (!queryParam["SqlParameter"].IsEmpty())
                 {
                     strSql.Append(queryParam["SqlParameter"].ToString());