From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java | 65 +++++++++++---------------------
1 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java
index 2765a97..a99e42d 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java
@@ -4,7 +4,9 @@
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountInsertDTO;
import com.moral.api.pojo.dto.account.AccountUpdateDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
@@ -19,56 +21,33 @@
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class AccountUpdateVO extends AccountVO{
- /*
- * ������������
- * */
- public static final String SUCCESS = "0";
+public class AccountUpdateVO extends AccountVO {
- /*
- * ���������������
- * */
- public static final String ACCOUNT_NOT_EXIST = "-1";
+ public static AccountUpdateVO convert(AccountUpdateDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
- /*
- * ������������������������
- * */
- public static final String MOBILE_INVALID = "-2";
-
- /*
- * ���������������������
- * */
- public static final String EMAIL_INVALID = "-3";
-
- private String code;
-
-
- public static AccountUpdateVO convert(AccountUpdateDTO dto){
AccountUpdateVO vo = new AccountUpdateVO();
- if(dto.getCode()== AccountUpdateDTO.SUCCESS){
- Integer id = dto.getAccount().getId();
- String userName = dto.getAccount().getUserName();
- String email = dto.getAccount().getEmail();
- String mobile = dto.getAccount().getMobile();
- String wechat = dto.getAccount().getWechat();
- String isDelete = dto.getAccount().getIsDelete();
- //������������������������
- List<ManageRole> roles = dto.getRoles();
- List<String> roleNames = new ArrayList<>();
- roles.forEach(role->roleNames.add(role.getName()));
+ Integer id = dto.getAccount().getId();
+ String userName = dto.getAccount().getUserName();
+ String email = dto.getAccount().getEmail();
+ String mobile = dto.getAccount().getMobile();
+ String wechat = dto.getAccount().getWechat();
- vo.setId(id);
- vo.setUserName(userName);
- vo.setEmail(email);
- vo.setMobile(mobile);
- vo.setWechat(wechat);
- vo.setIsDelete(isDelete);
- vo.setRoleNames(roleNames);
+ //������������������������
+ List<ManageRole> roles = dto.getRoles();
+ List<String> roleNames = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(role -> roleNames.add(role.getName()));
}
+ vo.setId(id);
+ vo.setUserName(userName);
+ vo.setEmail(email);
+ vo.setMobile(mobile);
+ vo.setWechat(wechat);
+ vo.setRoleNames(roleNames);
- String code = dto.getCode();
- vo.setCode(code);
return vo;
}
}
--
Gitblit v1.8.0