From 13bd8b759742f0a654679b0c8e152e7a1fb70db9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 08:55:46 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index 947fae4..d17e139 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -89,21 +89,10 @@
//������������������
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
wrapper.eq("account", account);
- List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wrapper);
- if (ObjectUtils.isEmpty(manageAccounts)) {
- loginDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
- loginDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
- return loginDTO;
- }
- //������������������������
- ManageAccount manageAccount = null;
- for (ManageAccount value : manageAccounts) {
- if (Constants.NOT_DELETE.equals(value.getIsDelete()))
- manageAccount = value;
- }
-
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ ManageAccount manageAccount = manageAccountMapper.selectOne(wrapper);
if (ObjectUtils.isEmpty(manageAccount)) {
- loginDTO.setCode(ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
+ loginDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
loginDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return loginDTO;
}
@@ -131,11 +120,9 @@
//������token ������������������
String token = TokenUtils.getToken(String.valueOf(manageAccount.getId()), accountInfoDTO);
-
//������������������
loginDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
loginDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
- loginDTO.setAccountInfoDTO(accountInfoDTO);
loginDTO.setToken(token);
//������������������
@@ -269,7 +256,7 @@
Page resultPage = manageAccountMapper.selectPage(queryPage, wrapper);
List<ManageAccount> accounts = resultPage.getRecords();
//������������������������������admin������admin���������������������
- AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken();
+ AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfo();
List<ManageRole> ownRoles = accountInfoDTO.getRoles();
boolean ownAdminRole = false;
for (ManageRole ownRole : ownRoles) {
--
Gitblit v1.8.0