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/AccountDeleteVO.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java
index f06ea46..ef0b15e 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.entity.ManageAccount;
import com.moral.api.pojo.dto.account.AccountDeleteDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
import org.springframework.util.ObjectUtils;
@@ -18,24 +19,14 @@
public class AccountDeleteVO extends AccountVO {
- /*
- * ������������
- * */
- public final static String SUCCESS = "0";
-
- /*
- * ���������������
- * */
- public final static String ACCOUNT_NOT_EXIST = "-1";
public static AccountDeleteVO convert(AccountDeleteDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
AccountDeleteVO vo = new AccountDeleteVO();
- vo.setCode(dto.getCode());
- if (!ObjectUtils.isEmpty(dto.getAccount())) {
- ManageAccount account = dto.getAccount();
- vo.setId(account.getId());
- vo.setUserName(account.getUserName());
- }
+ ManageAccount account = dto.getAccount();
+ vo.setId(account.getId());
+ vo.setUserName(account.getUserName());
return vo;
}
}
--
Gitblit v1.8.0