From 1ec0374d08be45c6c6854705211dbd6c067dfab7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 18 Mar 2021 17:23:20 +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, 11 insertions(+), 4 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 16462d3..77b190b 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
@@ -3,7 +3,9 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.pojo.dto.account.AccountDTO;
import com.moral.api.pojo.dto.account.AccountQueryDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
@@ -29,16 +31,21 @@
private List<AccountVO> accountVOs;
- public static AccountQueryVO convert(AccountQueryDTO dto){
+ public static AccountQueryVO convert(AccountQueryDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
+
long total = dto.getTotal();
long current = dto.getCurrent();
long pages = dto.getPages();
long size = dto.getSize();
List<AccountVO> accountVOs = new ArrayList<>();
List<AccountDTO> accountDTOs = dto.getAccountDTOS();
- for (AccountDTO accountDTO : accountDTOs) {
- AccountVO vo = AccountVO.convert(accountDTO);
- accountVOs.add(vo);
+ if (!ObjectUtils.isEmpty(accountDTOs)) {
+ for (AccountDTO accountDTO : accountDTOs) {
+ AccountVO vo = AccountVO.convert(accountDTO);
+ accountVOs.add(vo);
+ }
}
AccountQueryVO vo = new AccountQueryVO();
vo.setTotal(total);
--
Gitblit v1.8.0