角色管理

src/main/java/com/sxtvs/open/api/user/entity/User.java

@@ -3,6 +3,7 @@ package com.sxtvs.open.api.user.entity;
 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 com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
@@ -36,10 +37,13 @@ public class User implements Serializable {
 
     private Integer roleId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime logoutTime;
 
     @TableField(exist = false)

src/main/java/com/sxtvs/open/api/user/service/impl/UserServiceImpl.java

@@ -29,6 +29,7 @@ import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -142,10 +143,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     public Page<User> users(UserDTO userDTO){
         LambdaQueryWrapper<User> lambdaQueryWrapper = Wrappers.lambdaQuery();
 
-        return baseMapper.selectPage(new Page<>(userDTO.getPage(), userDTO.getPageSize()),
+        Page<User> userPage = baseMapper.selectPage(new Page<>(userDTO.getPage(), userDTO.getPageSize()),
                 lambdaQueryWrapper.like(!TextUtils.isEmpty(userDTO.getName()), User::getLoginName, userDTO.getName())
                         .eq(userDTO.getRoleId() != null && userDTO.getRoleId() > 0, User::getRoleId, userDTO.getRoleId())
         );
+
+        if(userPage.getTotal() > 0){
+            userPage.setRecords(userPage.getRecords().stream().peek(user -> {
+                user.setUserRole(userRoleService.getById(user.getRoleId()));
+            }).collect(Collectors.toList()));
+        }
+
+        return userPage;
+
     }
 
     public void updateRole(UserDTO userDTO){