huwhois 4 years ago
parent
commit
f732ef1320

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

33
33
34
    @Override
34
    @Override
35
    public List<ReportEntity> listByBranch(Long mid, Long bid) {
35
    public List<ReportEntity> listByBranch(Long mid, Long bid) {
36
        return this.list(new QueryWrapper<ReportEntity>().eq(bid == 0, "meeting_id", mid).eq("branch_id", bid));
36
        return this.list(new QueryWrapper<ReportEntity>().eq(bid == 0, "meeting_id", mid).eq("branch_id", bid).orderByAsc("sort"));
37
    }
37
    }
38
38
39
    @Override
39
    @Override
40
    public List<ReportEntity> listByBranch(Long mid) {
40
    public List<ReportEntity> listByBranch(Long mid) {
41
        return this.list(new QueryWrapper<ReportEntity>().eq("meeting_id", mid));
41
        return this.list(new QueryWrapper<ReportEntity>().eq("meeting_id", mid).orderByAsc("sort"));
42
    }
42
    }
43
43
44
}
44
}