From 2c09a2201b35b861e5e754cd0f53b9671abf84c2 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Wed, 7 Apr 2021 12:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8D=95=E9=80=89=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=8E=BB=E6=8E=89=E5=A4=8D=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Department/DepartmentBLL.cs               | 86 +++++++++++++++++++
 .../Department/DepartmentIBLL.cs              | 14 +++
 .../Views/EmpInfo/Index.js                    |  2 +-
 .../Controllers/DepartmentController.cs       | 22 +++++
 4 files changed, 123 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs
index 10b20d45f..7f009dba0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs	
@@ -223,6 +223,47 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+        public List<TreeModel> GetTreeNoCheck(string companyId, string parentId)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(companyId))
+                {// 如果公司主键没有的话，需要加载公司信息
+                    return new List<TreeModel>();
+                }
+
+                List<DepartmentEntity> list = GetList(companyId);
+                List<TreeModel> treeList = new List<TreeModel>();
+                foreach (var item in list)
+                {
+                    TreeModel node = new TreeModel
+                    {
+                        id = item.F_DepartmentId,
+                        text = item.F_FullName,
+                        value = item.F_DepartmentId,
+                        showcheck = false,
+                        checkstate = 0,
+                        isexpand = true,
+                        parentId = item.F_ParentId
+                    };
+
+                    treeList.Add(node);
+                }
+                return treeList.ToTree(parentId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取树形数据
         /// </summary>
@@ -268,6 +309,51 @@ namespace Learun.Application.Organization
                 }
             }
         }
+        /// <summary>
+        /// 获取部门树无复选框
+        /// </summary>
+        /// <param name="companylist"></param>
+        /// <returns></returns>
+        public List<TreeModel> GetTreeNoCheck(List<CompanyEntity> companylist)
+        {
+            try
+            {
+                List<TreeModel> treeList = new List<TreeModel>();
+                foreach (var companyone in companylist)
+                {
+                    List<TreeModel> departmentTree = GetTreeNoCheck(companyone.F_CompanyId, "");
+                    if (departmentTree.Count > 0)
+                    {
+                        TreeModel node = new TreeModel
+                        {
+                            id = companyone.F_CompanyId,
+                            text = companyone.F_FullName,
+                            value = companyone.F_CompanyId,
+                            showcheck = false,
+                            checkstate = 0,
+                            isexpand = true,
+                            parentId = "0",
+                            hasChildren = true,
+                            ChildNodes = departmentTree,
+                            complete = true
+                        };
+                        treeList.Add(node);
+                    }
+                }
+                return treeList;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
 
         /// <summary>
         /// 获取部门本身和子部门的id
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentIBLL.cs
index 16cff28d9..37df3ea63 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentIBLL.cs	
@@ -62,6 +62,20 @@ namespace Learun.Application.Organization
         /// <returns></returns>
         List<TreeModel> GetTree(List<CompanyEntity> companylist);
         /// <summary>
+        /// 获取树形数据无复选框
+        /// </summary>
+        /// <param name="companyId">公司id</param>
+        /// <param name="parentId">父级id</param>
+        /// <returns></returns>
+        List<TreeModel> GetTreeNoCheck(string companyId, string parentId);
+        /// <summary>
+        /// 获取树形数据无复选框
+        /// </summary>
+        /// <param name="companyId">公司id</param>
+        /// <param name="parentId">父级id</param>
+        /// <returns></returns>
+        List<TreeModel> GetTreeNoCheck(List<CompanyEntity> companylist);
+        /// <summary>
         /// 获取部门本身和子部门的id
         /// </summary>
         /// <param name="parentId">父级ID</param>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
index cf8448181..581242ffc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js	
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) {
                 // 是否允许搜索
                 allowSearch: true,
                 // 访问数据接口地址
-                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
                 // 访问数据接口参数
             });
             // 刷新
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs
index f81b9b7c9..fc10f0a1f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs	
@@ -75,6 +75,28 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
             }
         }
         /// <summary>
+        /// 获取无复选框的部门树
+        /// </summary>
+        /// <param name="companyId"></param>
+        /// <param name="parentId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTreeNoCheck(string companyId, string parentId)
+        {
+            if (string.IsNullOrEmpty(companyId))
+            {
+                var companylist = companyIBLL.GetList();
+                var data = departmentIBLL.GetTreeNoCheck(companylist);
+                return JsonResult(data);
+            }
+            else
+            {
+                var data = departmentIBLL.GetTreeNoCheck(companyId, parentId);
+                return JsonResult(data);
+            }
+        }
+        /// <summary>
         /// 获取部门实体数据
         /// </summary>
         /// <param name="companyId"></param>