From 10c218463b376967e07a9c28de565ef741a0a308 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 17 Mar 2021 17:26:24 +0800
Subject: [PATCH] Common模块： 修改用户不存在常量名 修改ResultMessage中使用的常量 manage模块： 账号的增删改查进行修改
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 155685e..3f6463b 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,6 +5,7 @@
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountDTO;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
@@ -20,8 +21,6 @@
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class AccountVO {
- private String code;
-
private Integer id;
private String userName;
@@ -34,14 +33,16 @@
private List<String> roleNames;
- public static AccountVO convert(AccountDTO dto){
- if(dto.getAccount()==null)
+ 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()));
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(role -> roleNames.add(role.getName()));
+ }
vo.setId(account.getId());
vo.setUserName(account.getUserName());
vo.setEmail(account.getEmail());
--
Gitblit v1.8.0