Merge branch 'sync_sci' into debug

# Conflicts:
#	services/system.go

controllers/data_manage/manual.go

@@ -98,7 +98,7 @@ func (this *ManualController) ManualSysUserSearch() {
 	}
 
 	// 构建分组树（以前这里还有个keyword匹配，不知道用作干嘛的，先去掉吧）
-	groupTree := services.BuildGroupTree(groups, groupAdmins)
+	groupTree := services.BuildGroupTreeV2(groups, groupAdmins)
 
 	// 部门
 	list := make([]*system.DepartmentUserTree, 0)

controllers/sys_department.go

@@ -372,7 +372,7 @@ func (this *SysDepartmentController) DepartmentUserTree() {
 	}
 
 	// 构建分组树（以前这里还有个keyword匹配，不知道用作干嘛的，先去掉吧）
-	groupTree := services.BuildGroupTree(groups, groupAdmins)
+	groupTree := services.BuildGroupTreeV2(groups, groupAdmins)
 
 	// 部门
 	list := make([]*system.DepartmentUserTree, 0)

services/system.go

@@ -88,8 +88,8 @@ func DeleteSysGroupByIds(ids []int) (err error) {
 	return
 }
 
-// BuildGroupTree 构建分组树
-func BuildGroupTree(groups []*system.SysFullGroup, groupAdmins map[int][]*system.DepartmentUserTree) map[int][]*system.DepartmentUserTree {
+// BuildGroupTreeV2 构建分组树
+func BuildGroupTreeV2(groups []*system.SysFullGroup, groupAdmins map[int][]*system.DepartmentUserTree) map[int][]*system.DepartmentUserTree {
 	// 创建分组ID到节点的映射
 	groupMap := make(map[int]*system.DepartmentUserTree)
 	idList := make([]int, 0, len(groups))