From afadc8c33a89b97c73f056f741e5705f8ad291d3 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 11 Mar 2021 08:23:24 +0800
Subject: [PATCH] manage登陆模块修改 根据accountId辨识登陆状态
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 2 +-
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
index 0a55944..5b3ff22 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
@@ -24,7 +24,7 @@
if(!ObjectUtils.checkParamAndMap(paramters,"account","password"))
return ResultMessage.fail("���������������");
Map<String, Object> result = accountService.login(paramters);
- if(result.get("accountId").equals(-1))
+ if((int)result.get("accountId")<0)
return ResultMessage.fail(result);
return ResultMessage.ok(result);
}
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 48d1b78..b76ddbe 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
@@ -54,32 +54,32 @@
ManageAccount manageAccount = accountMapper.selectOne(wrapper);
if(ObjectUtils.isEmpty(manageAccount)){
result.put("accountId",-1);
- result.put("msg","������������������");
+ result.put("msg","���������������");
return result;
}
//������������������������
if(manageAccount.getIsDelete().equals("1")){
- result.put("accountId",-1);
+ result.put("accountId",-2);
result.put("msg","������������������");
return result;
}
//������������
if(!MD5Utils.saltMD5Verify(password,manageAccount.getPassword())){
- result.put("accountId",-1);
+ result.put("accountId",-3);
result.put("msg","���������������������");
return result;
}
//������������
List<ManageRole> roles = roleMapper.getManageRoleByAccountId(manageAccount.getId());
if(ObjectUtils.isEmpty(roles)){
- result.put("accountId",-1);
+ result.put("accountId",-4);
result.put("msg","������������������������");
return result;
}
//������������
List<ManageMenu> menus = manageMenuMapper.getParentChildrenMenusByRoles(roles);
if(ObjectUtils.isEmpty(menus)){
- result.put("accountId",-1);
+ result.put("accountId",-5);
result.put("msg","������������������������");
return result;
}
@@ -92,7 +92,7 @@
userInfo.put("menus",menus);//������������
Map<String, Object> tokenResult = TokenUtils.getToken(String.valueOf(manageAccount.getId()), userInfo);
if(tokenResult.get("code").equals(TokenUtils.error)){
- result.put("accountId",-1);
+ result.put("accountId",-6);
result.put("msg","������token������");
return result;
}
--
Gitblit v1.8.0