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/login/LoginVO.java | 46 ++++++----------------------------------------
1 files changed, 6 insertions(+), 40 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
index acc760f..52878a0 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.pojo.dto.login.AccountInfoDTO;
import com.moral.api.pojo.dto.login.LoginDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
import org.springframework.util.ObjectUtils;
@@ -17,40 +18,6 @@
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class LoginVO {
- /*
- * ������������
- * */
- public static final String SUCCESS = "0";
-
- /*
- * ���������������
- * */
- public static final String NOT_EXIST = "-1";
-
- /*
- * ������������������
- * */
- public static final String IS_DELETE = "-2";
-
- /*
- * ������������
- * */
- public static final String PASSWORD_ERROR = "-3";
-
- /*
- * ������������������
- * */
- public static final String ROLE_EMPTY = "-4";
-
- /*
- * ������������������
- * */
- public static final String MENU_EMPTY = "-5";
-
- /*
- * ���������
- * */
- private String code;
/*
*������token
@@ -70,16 +37,15 @@
* @Date: 2021/3/13
*/
public static LoginVO convert(LoginDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
+
LoginVO vo = new LoginVO();
- String code = dto.getCode();
String token = dto.getToken();
AccountInfoDTO accountInfoDTO = dto.getAccountInfoDTO();
- if (!ObjectUtils.isEmpty(accountInfoDTO)) {
- AccountInfoVO accountInfoVO = AccountInfoVO.convert(accountInfoDTO);
- vo.setAccountInfoVO(accountInfoVO);
- }
+ AccountInfoVO accountInfoVO = AccountInfoVO.convert(accountInfoDTO);
+ vo.setAccountInfoVO(accountInfoVO);
vo.setToken(token);
- vo.setCode(code);
return vo;
}
}
--
Gitblit v1.8.0