Commit 87c73958 authored by 王亮's avatar 王亮

add createdAt at User query.

parent b1843bd9
......@@ -2,9 +2,11 @@ package cn.quantgroup.xyqb.model;
import cn.quantgroup.xyqb.entity.User;
import cn.quantgroup.xyqb.entity.WechatUserInfo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.collections.CollectionUtils;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
......@@ -24,6 +26,9 @@ public class UserBean {
private Boolean enable;
private Integer tenantId;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime createdAt;
public static UserBean from(User user, WechatUserInfo wechatUserInfo) {
UserBean userBean = new UserBean();
......@@ -33,6 +38,7 @@ public class UserBean {
userBean.setUuid(user.getUuid());
userBean.setEnable(user.getEnable());
userBean.setTenantId(user.getTenantId());
userBean.setCreatedAt(user.getCreatedAt());
if (wechatUserInfo != null) {
userBean.setOpenId(wechatUserInfo.getOpenId());
userBean.setUnionId(wechatUserInfo.getUnionId());
......@@ -52,6 +58,7 @@ public class UserBean {
userBean.setUuid(user.getUuid());
userBean.setEnable(user.getEnable());
userBean.setTenantId(user.getTenantId());
userBean.setCreatedAt(user.getCreatedAt());
if (CollectionUtils.isNotEmpty(wechatUserInfoList)) {
Optional<WechatUserInfo> optionalWechatUserInfo = wechatUserInfoList.stream().filter(i -> i.getUserId().equals(user.getId())).findFirst();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment