From e7bc156f901b06e5af54cfe86fe53e7491af7b7f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:22:27 +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/AccountQueryVO.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
index 7df374e..11ad7c3 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
@@ -63,19 +63,24 @@
public static AccountVO convertToQueryPage(AccountDTO dto) {
if (dto.getAccount() == null)
return null;
- AccountInsertVO vo = new AccountInsertVO();
+ 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()));
+ if(!ObjectUtils.isEmpty(roles)){
+ roles.forEach(value-> {
+ value.setIsDelete(null);
+ value.setCreateTime(null);
+ value.setUpdateTime(null);
+ value.setDesc(null);
+ });
}
vo.setId(account.getId());
+ vo.setAccount(account.getAccount());
vo.setUserName(account.getUserName());
vo.setEmail(account.getEmail());
vo.setMobile(account.getMobile());
vo.setWechat(account.getWechat());
- vo.setRoleNames(roleNames);
+ vo.setRoles(roles);
//Date������String
Date createTime = account.getCreateTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
--
Gitblit v1.8.0