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/AccountQueryVO.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 70c68b4..501c78f 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
@@ -66,24 +66,25 @@
AccountInsertVO vo = new AccountInsertVO();
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.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();
- 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