diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdDeptController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdDeptController.cs
index 9e6e7d06c..b7875fbfd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdDeptController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdDeptController.cs	
@@ -42,7 +42,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         #endregion
 
         #region  获取数据
-
+        /// <summary>
+        /// 获取树形数据
+        /// </summary>
+        /// <param name="parentId">父级id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTree(string parentId)
+        {
+            var data = cdDeptIBLL.GetTree(parentId);
+            return JsonResult(data);
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptBLL.cs
index 761e51319..7f1f837a3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptBLL.cs	
@@ -20,6 +20,68 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #region  获取数据
 
+        public List<TreeModel> GetTree(string parentId)
+        {
+            try
+            {
+                List<CdDeptEntity> list = GetList();
+                List<TreeModel> treeList = new List<TreeModel>();
+                foreach (var item in list)
+                {
+                    TreeModel node = new TreeModel
+                    {
+                        id = item.DeptNo,
+                        text = item.DeptName,
+                        value = item.DeptNo,
+                        showcheck = false,
+                        checkstate = 0,
+                        isexpand = true,
+                        parentId = item.DeptId
+                    };
+                    treeList.Add(node);
+                }
+                return treeList.ToTree();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <returns></returns>
+        public List<CdDeptEntity> GetList()
+        {
+            try
+            {
+                //List<CdDeptEntity> list = cache.Read<List<CdDeptEntity>>(cacheKey);
+                //if (list == null)
+                //{
+                //    list = (List<CdDeptEntity>)cdDeptService.GetList();
+                //    cache.Write<List<CdDeptEntity>>(cacheKey, list, CacheId.company);
+                //}
+                return list;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptIBLL.cs
index f78a44803..065acaa4a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptIBLL.cs	
@@ -15,6 +15,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     {
         #region  获取数据
 
+        /// <summary>
+        /// 获取树形数据
+        /// </summary>
+        /// <param name="parentId">父级id</param>
+        /// <returns></returns>
+        List<TreeModel> GetTree(string parentId);
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptService.cs
index dc46d1853..e32b67cd3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptService.cs	
@@ -20,6 +20,32 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     {
         #region  获取数据
 
+        /// <summary>
+        /// 获取公司列表信息（全部）
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<CdDeptEntity> GetList()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(" * ");
+                strSql.Append(" FROM CdDept t WHERE 1=1 order by t.deptSort ");
+                return this.BaseRepository("CollegeMIS").FindList<CdDeptEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>