|
@@ -37,12 +37,12 @@ public class FsUserAdminController extends BaseController {
|
|
|
@PostMapping("/list")
|
|
|
@ApiOperation("会员列表(与移动端使用的相同查询)")
|
|
|
public R pageList(@RequestBody FsUserPageListParam param) {
|
|
|
- PageHelper.startPage(param.getPageNum(), param.getPageSize());
|
|
|
- List<FsUserPageListVO> list = fsUserService.selectFsUserPageList(param);
|
|
|
- PageInfo<FsUserPageListVO> pageInfo = new PageInfo<>(list);
|
|
|
+// PageHelper.startPage(param.getPageNum(), param.getPageSize());
|
|
|
+ TableDataInfo tableDataInfo = fsUserService.selectFsUserPageListNew(param);
|
|
|
+// PageInfo<FsUserPageListVO> pageInfo = new PageInfo<>(list);
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
- result.put("rows", pageInfo.getList());
|
|
|
- result.put("total", pageInfo.getTotal());
|
|
|
+ result.put("rows", tableDataInfo.getRows());
|
|
|
+ result.put("total", tableDataInfo.getTotal());
|
|
|
return R.ok(result);
|
|
|
}
|
|
|
|