From ea81424035cc84d97cd114b82918bcbda73d7460 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:41:38 +0800
Subject: [PATCH] screen-manage 型号查询功能完善
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 30 ++++--------------------------
1 files changed, 4 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..3cdf8ef 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
@@ -27,11 +27,15 @@
private String userName;
+ private String account;
+
private String email;
private String mobile;
private String wechat;
+
+ private List<ManageRole> roles;
private List<String> roleNames;
@@ -39,30 +43,4 @@
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