From c3e1f9b9af29647bd157f2ea268bc56b2d3b9df1 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 31 Aug 2020 14:47:46 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index fe05269..5b671e4 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -89,20 +89,24 @@
String rawPassword = (String) parameters.get("password");
// account.setPassword(encoder.encode((String) parameters.get("password")));
account = accountMapper.selectOne(account);
- Integer existRole=accountMapper.getScreenRoleByAccountName(account.getAccountName());
- List<Menu> menuList = accountMapper.getScreenMenuListsByAccountName(account.getAccountName());
+ Integer existRole = null;
+ List<Menu> menuList = new ArrayList<>();
+ if (account != null) {
+ existRole = accountMapper.getScreenRoleByAccountName(account.getAccountName());
+ menuList = accountMapper.getScreenMenuListsByAccountName(account.getAccountName());
+ }
boolean isValid = account == null ? false : encoder.matches(rawPassword, account.getPassword());
if (!isValid) {
result.put("msg", "���������������������������������");
} else {
if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
- if(existRole!=null) {
+ if (existRole != null) {
result.put("msg", "���������������");
result.put("accountId", account.getId());
result.put("orgId", account.getOrganizationId());
- result.put("data",menuList);
+ result.put("data", menuList);
setOrgIdsByAccount(result);
- }else{
+ } else {
result.put("msg", "���������������������");
}
} else {
@@ -262,7 +266,7 @@
List<Menu> menuList = accountMapper.getParentMenuListsByAccountName(accountName);
Integer organizationId = accountMapper.getByAccountName(accountName).getOrganizationId();
Map<String, Object> organizationMap = new LinkedHashMap<>();
- organizationMap.put("organizationId",organizationId);
+ organizationMap.put("organizationId", organizationId);
String email = accountMapper.getEmailByAccountName(accountName);
Map<String, Object> mapList = new LinkedHashMap<>();
Map<String, Object> appMap = new LinkedHashMap<>();
--
Gitblit v1.8.0