Merge remote-tracking branch 'origin/eta/1.7.6' into debug

controllers/data_manage/data_manage_permission/data_move.go

@@ -120,7 +120,7 @@ func removeNodesWithNoJoinPermissionAndEmptyChildRecursively(nodes []*data_manag
 			node.Child = removeNodesWithNoJoinPermissionAndEmptyChildRecursively(node.Child)
 		}
 
-		if node.IsJoinPermission != 0 {
+		if node.IsJoinPermission != 0 || (node.Child != nil && len(node.Child) > 0) {
 			newListNode = append(newListNode, node)
 		}
 	}