..

src/main/java/io/renren/modules/admin/controller/ReportController.java

@@ -159,10 +159,10 @@ public class ReportController {
    /**
     * listbybranch
     */
    @GetMapping("/listbranch/{mid}/{bid}")
    @GetMapping("/listbranch/{mid}/{bid}/{sort}")
    @RequiresPermissions("admin:report:list")
    public R listByBranch(@PathVariable("mid") Long mid, @PathVariable("bid") Long bid){
        List<ReportEntity> list = reportService.listByBranch(mid, bid);
    public R listByBranch(@PathVariable("mid") Long mid, @PathVariable("bid") Long bid, @PathVariable("sort") String sort){
        List<ReportEntity> list = reportService.listByBranch(mid, bid, sort);
        return R.ok().put("list", list);
    }

src/main/java/io/renren/modules/admin/service/ReportService.java

@@ -18,7 +18,7 @@ public interface ReportService extends IService<ReportEntity> {
    PageUtils queryPage(Map<String, Object> params);
	List<ReportEntity> listByBranch(Long mid, Long bid);
	List<ReportEntity> listByBranch(Long mid, Long bid, String order);
	List<ReportEntity> listByBranch(Long mid);
}

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

@@ -32,13 +32,13 @@ 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).orderByAsc("sort"));
    public List<ReportEntity> listByBranch(Long mid, Long bid, String order) {
        return this.list(new QueryWrapper<ReportEntity>().eq(bid == 0, "meeting_id", mid).eq("branch_id", bid).orderByAsc(StringUtils.isNotBlank(order), order));
    }
    @Override
    public List<ReportEntity> listByBranch(Long mid) {
        return this.list(new QueryWrapper<ReportEntity>().eq("meeting_id", mid).orderByAsc("sort"));
        return this.list(new QueryWrapper<ReportEntity>().eq("meeting_id", mid));
    }
}