From cdf57ef11128f7df6f216c1c717ac783c625fa1b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 14 Apr 2021 17:31:59 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 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 1549399..479beb2 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
@@ -33,36 +33,12 @@
private String wechat;
+ private List<ManageRole> roles;
+
private List<String> roleNames;
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<>();
- 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