Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.User/DepartmentModule.cs

@@ -145,14 +145,26 @@ namespace Edu.Module.User
             {
                 deptList = new List<RB_Department_ViewModel>();
             }
-            if(isQueryEmployee)
+            if (isQueryEmployee)
+            {
+                empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
                 {
-                empList= accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Group_Id = query.Group_Id });
+                    Group_Id = query.Group_Id,
+                    School_Id = query.School_Id
+                });
             }
-
             if (deptList != null && deptList.Count > 0)
             {
-                var firstList = deptList.Where(qitem => qitem.ParentId == 0 && qitem.School_Id==0).ToList();
+                var firstList = new List<RB_Department_ViewModel>();
+                if (query.School_Id == 0)
+                {
+                    firstList = deptList.Where(qitem => qitem.ParentId == 0 && qitem.School_Id == 0).ToList();
+                }
+                else
+                {
+                    var minParentId = deptList.Where(qitem => qitem.School_Id == query.School_Id).Min(qitem => qitem.ParentId);
+                    firstList = deptList.Where(qitem => qitem.ParentId == minParentId && qitem.School_Id == query.School_Id).ToList();
+                }
                 if (firstList != null && firstList.Count > 0)
                 {
                     foreach (var fItem in firstList)
@@ -181,7 +193,7 @@ namespace Edu.Module.User
                                         DeptName = eItem.EmployeeName,
                                         ParentId = 0,
                                         ChildList = new List<DepartmentTree_ViewModel>(),
-                                        School_Id=eItem.School_Id
+                                        School_Id = eItem.School_Id
                                     });
                                 }
                             }
@@ -192,6 +204,7 @@ namespace Edu.Module.User
                         list.Add(tModel);
                     }
                 }
+
             }
             return list;
         }

Edu.WebApi/Controllers/User/UserController.cs

@@ -897,8 +897,11 @@ namespace Edu.WebApi.Controllers.User
         [HttpPost]
         public ApiResult GetDeptTree()
         {
-            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Department_ViewModel>(RequestParm.Msg.ToString());
-            query.Group_Id = base.UserInfo.Group_Id;
+            var query = new RB_Department_ViewModel()
+            {
+                Group_Id = base.UserInfo.Group_Id,
+                School_Id = base.ParmJObj.GetInt("School_Id")
+            };
             var list = departmentModule.GetDepartmentTreeModule(query);
             return ApiResult.Success(data: list);
         }