From 3b72f1f4dd46191857583a166d5b67722c6b118e Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:19:50 +0800
Subject: [PATCH] manage模块 添加组织增删改功能 查待完成
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
index 155685e..1549399 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
@@ -5,8 +5,11 @@
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountDTO;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -20,8 +23,6 @@
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class AccountVO {
- private String code;
-
private Integer id;
private String userName;
@@ -34,20 +35,34 @@
private List<String> roleNames;
- public static AccountVO convert(AccountDTO dto){
- if(dto.getAccount()==null)
+ private String createTime;
+
+ private String updateTime;
+
+ public static AccountVO convert(AccountDTO dto) {
+ if (dto.getAccount() == null)
return null;
AccountVO vo = new AccountVO();
ManageAccount account = dto.getAccount();
List<ManageRole> roles = dto.getRoles();
List<String> roleNames = new ArrayList<>();
- roles.forEach(role->roleNames.add(role.getName()));
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(role -> roleNames.add(role.getName()));
+ }
vo.setId(account.getId());
vo.setUserName(account.getUserName());
vo.setEmail(account.getEmail());
vo.setMobile(account.getMobile());
vo.setWechat(account.getWechat());
vo.setRoleNames(roleNames);
+ //Date������String
+ Date createTime = account.getCreateTime();
+ Date updateTime = account.getUpdateTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String createTimeStr = sdf.format(createTime);
+ String updateTimeStr = sdf.format(updateTime);
+ vo.setCreateTime(createTimeStr);
+ vo.setUpdateTime(updateTimeStr);
return vo;
}
}
--
Gitblit v1.8.0