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/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