diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java index ebbbdbd20..1f19f46cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java @@ -21,6 +21,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -32,6 +34,7 @@ import org.nl.modules.logging.annotation.Log; import org.nl.common.utils.SecurityUtils; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; +import org.nl.system.service.user.dto.SysUserDetail; import org.nl.system.service.user.dto.UserQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -39,6 +42,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.List; import java.util.Map; import java.util.Set; @@ -58,7 +62,11 @@ public class UserController { @GetMapping public ResponseEntity query(UserQuery query, PageQuery page) { - return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)), HttpStatus.OK); + Page startPage = PageHelper.startPage(page.getPage() + 1, page.getSize()); + List userDetail = userService.getUserDetail(query, page); + TableDataInfo build = TableDataInfo.build(userDetail); + build.setTotalElements(startPage.getTotal()); + return new ResponseEntity(build, HttpStatus.OK); } @Log("新增用户")