修改获取用户列表接口

src/main/java/cn/qg/holmes/controller/auth/UserController.java

@@ -4,6 +4,7 @@ import cn.qg.holmes.common.JsonResult;
 import cn.qg.holmes.entity.auth.LoginVo;
 import cn.qg.holmes.entity.auth.User;
 import cn.qg.holmes.entity.auth.UserInfoVo;
+import cn.qg.holmes.entity.auth.UserRole;
 import cn.qg.holmes.service.auth.LoginService;
 import cn.qg.holmes.service.auth.TokenService;
 import cn.qg.holmes.service.auth.UserRoleService;
@@ -92,7 +93,7 @@ public class UserController {
     @GetMapping("/list")
     public JsonResult getUserList(@RequestParam(defaultValue = "1") Integer pageNum,
                                   @RequestParam(defaultValue = "10") Integer pageSize) {
-        IPage<User> userIPage = userService.getUserInfoList(pageNum, pageSize);
+        IPage<UserRole> userIPage = userService.getUserInfoList(pageNum, pageSize);
         Map<String, Object> map = new HashMap<>();
         map.put("total", userIPage.getTotal());
         map.put("list", userIPage.getRecords());

src/main/java/cn/qg/holmes/entity/auth/UserRole.java

 package cn.qg.holmes.entity.auth;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -17,4 +18,8 @@ public class UserRole {
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+    @TableField(exist = false)
+    private String userName;
+    @TableField(exist = false)
+    private String roleName;
 }

src/main/java/cn/qg/holmes/mapper/auth/UserMapper.java

 package cn.qg.holmes.mapper.auth;
 
 import cn.qg.holmes.entity.auth.User;
+import cn.qg.holmes.entity.auth.UserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.Map;
+
 public interface UserMapper extends BaseMapper<User> {
 
-    IPage<User> getUserInfoList(IPage<User> page);
+    IPage<UserRole> getUserInfoList(IPage<User> page);
 }

src/main/java/cn/qg/holmes/service/auth/UserService.java

@@ -2,6 +2,7 @@ package cn.qg.holmes.service.auth;
 
 import cn.qg.holmes.entity.auth.User;
 import cn.qg.holmes.entity.auth.UserInfoVo;
+import cn.qg.holmes.entity.auth.UserRole;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,5 +12,5 @@ public interface UserService extends IService<User> {
 
     UserInfoVo getUserInfoByUsername(String username);
 
-    IPage<User> getUserInfoList(Integer pageNum, Integer pageSize);
+    IPage<UserRole> getUserInfoList(Integer pageNum, Integer pageSize);
 }

src/main/java/cn/qg/holmes/service/auth/impl/UserServiceImpl.java

@@ -2,6 +2,7 @@ package cn.qg.holmes.service.auth.impl;
 
 import cn.qg.holmes.entity.auth.User;
 import cn.qg.holmes.entity.auth.UserInfoVo;
+import cn.qg.holmes.entity.auth.UserRole;
 import cn.qg.holmes.mapper.auth.UserMapper;
 import cn.qg.holmes.service.auth.RolePermissionService;
 import cn.qg.holmes.service.auth.UserRoleService;
@@ -64,7 +65,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * @return
      */
     @Override
-    public IPage<User> getUserInfoList(Integer pageNum, Integer pageSize) {
+    public IPage<UserRole> getUserInfoList(Integer pageNum, Integer pageSize) {
         IPage<User> page = new Page<>(pageNum, pageSize);
         return userMapper.getUserInfoList(page);
     }

src/main/resources/mapper/auth/UserMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.qg.holmes.mapper.auth.UserMapper">
 
-    <select id="getUserInfoList" resultType="cn.qg.holmes.entity.auth.User">
-        SELECT u.`id`, u.`username`, u.`create_time` as createTime, u.`update_time` as updateTime, r.`id` as roleId, r.`role_name` as roleName FROM `user` u
+    <select id="getUserInfoList" resultType="cn.qg.holmes.entity.auth.UserRole">
+        SELECT ur.*, u.`username` as userName, r.`role_name` as roleName FROM `user` u
             INNER JOIN `role` r
             INNER JOIN `user_role` ur
-            ON u.`id` = ur.`user_id` AND  r.`id` = ur.`role_id`
+            ON u.`id` = ur.`user_id` AND r.`id` = ur.`role_id`
     </select>
 </mapper>
\ No newline at end of file