..

src/main/java/io/renren/modules/admin/service/impl/ReportServiceImpl.java

@@ -33,12 +33,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity> impl
    @Override
    public List<ReportEntity> listByBranch(Long mid, Long bid) {
        return this.list(new QueryWrapper<ReportEntity>().eq(bid == 0, "meeting_id", mid).eq("branch_id", bid));
        return this.list(new QueryWrapper<ReportEntity>().eq(bid == 0, "meeting_id", mid).eq("branch_id", bid).orderByAsc("sort"));
    }
    @Override
    public List<ReportEntity> listByBranch(Long mid) {
        return this.list(new QueryWrapper<ReportEntity>().eq("meeting_id", mid));
        return this.list(new QueryWrapper<ReportEntity>().eq("meeting_id", mid).orderByAsc("sort"));
    }
}