添加groupBy，修复orderBy