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 3252d1a1e..cfa96ee63 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	
@@ -311,11 +311,66 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        //public List<Acc_DormitoryBuildEntity> GetDept()
+        //{
+        //    try
+        //    {
+        //        return accommodationService.GetSelectData("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        if (ex is ExceptionEx)
+        //        {
+        //            throw;
+        //        }
+        //        else
+        //        {
+        //            throw ExceptionEx.ThrowBusinessException(ex);
+        //        }
+        //    }
+        //}
+        //public List<Acc_DormitoryBuildEntity> GetMajor(string strWhere)
+        //{
+        //    try
+        //    {
+        //        return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        if (ex is ExceptionEx)
+        //        {
+        //            throw;
+        //        }
+        //        else
+        //        {
+        //            throw ExceptionEx.ThrowBusinessException(ex);
+        //        }
+        //    }
+        //}
+        //public List<Acc_DormitoryBuildEntity> GetClass(string strWhere)
+        //{
+        //    try
+        //    {
+        //        return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        if (ex is ExceptionEx)
+        //        {
+        //            throw;
+        //        }
+        //        else
+        //        {
+        //            throw ExceptionEx.ThrowBusinessException(ex);
+        //        }
+        //    }
+        //}
+
         public List<Acc_DormitoryBuildEntity> GetDept()
         {
             try
             {
-                return accommodationService.GetSelectData("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList();
+                return accommodationService.GetDeptOrMajorOrClass("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList();
             }
             catch (Exception ex)
             {
@@ -333,7 +388,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList();
+                return accommodationService.GetDeptOrMajorOrClass(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList();
             }
             catch (Exception ex)
             {
@@ -351,7 +406,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList();
+                return accommodationService.GetDeptOrMajorOrClass(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList();
             }
             catch (Exception ex)
             {
@@ -365,7 +420,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 }
             }
         }
-
         /// <summary>
         /// 获取左侧树形数据
         /// <summary>
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 6eed65103..05b5b1f0e 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	
@@ -1887,6 +1887,46 @@ where ID='{ParentID}'
                 }
             }
         }
+
+
+        public List<Acc_DormitoryBuildEntity> GetDeptOrMajorOrClass(string strWhere)
+        {
+            try
+            {
+                string sql1 = " select distinct dept,d.DeptName from Acc_DormitoryBuild t join CdDept d on t.dept=d.deptno";
+                string sql2 = " select distinct major,m.MajorName from Acc_DormitoryBuild t join CdMajor m on t.major=m.majorno";
+                string sql3 = " select distinct class,c.ClassName from Acc_DormitoryBuild t join ClassInfo c on t.class=c.classno";
+                string sql = @" where t.ID in (
+                select parentid from[dbo].[Acc_DormitoryBuild] where BuildType = '5' and(studentid is not null and len(studentid) > 0)
+                    )";
+                if (string.IsNullOrEmpty(strWhere))
+                {
+                    sql = sql1 + sql;
+                }
+                else if (strWhere.Contains("deptno"))
+                {
+                    sql = sql2 + sql + " and " + strWhere;
+                }
+                else if (strWhere.Contains("majorno"))
+                {
+                    sql = sql3 + sql + " and " + strWhere;
+                }
+                return this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>(sql).ToList();
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion 提交数据
     }
 }
\ No newline at end of file