From 381d0465a589a1862e9d79394619ae4bcc04350b Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 07 Apr 2021 08:39:51 +0800
Subject: [PATCH] 角色功能修改
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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 fbd5d06..e2de4d8 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;
/**
@@ -18,8 +21,8 @@
**/
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-
public class AccountVO {
+
private Integer id;
private String userName;
@@ -30,25 +33,11 @@
private String wechat;
- private String isDelete;
-
private List<String> roleNames;
- 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()));
- vo.setId(account.getId());
- vo.setUserName(account.getUserName());
- vo.setEmail(account.getEmail());
- vo.setMobile(account.getMobile());
- vo.setWechat(account.getWechat());
- vo.setIsDelete(account.getIsDelete());
- vo.setRoleNames(roleNames);
- return vo;
- }
+ private String createTime;
+
+ private String updateTime;
+
+
}
--
Gitblit v1.8.0