Commit 3d6d996f authored by jim's avatar jim

pom

parent 3f870445
...@@ -340,6 +340,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -340,6 +340,7 @@ public class AccountServiceImpl implements AccountService {
resultDto.setStatus(0); resultDto.setStatus(0);
resultDto.setData(current); resultDto.setData(current);
} catch (Exception e) { } catch (Exception e) {
log.error("eeee", e);
resultDto.setStatus(-1); resultDto.setStatus(-1);
Map<String, Object> statusInfo = new HashMap<>(); Map<String, Object> statusInfo = new HashMap<>();
statusInfo.put("code", AccountErrorCode.NAMENOTEXIST); statusInfo.put("code", AccountErrorCode.NAMENOTEXIST);
...@@ -448,7 +449,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -448,7 +449,7 @@ public class AccountServiceImpl implements AccountService {
if (StringUtils.isEmpty(parentName)) { if (StringUtils.isEmpty(parentName)) {
account.setAllowedToCreateSubUser(true); account.setAllowedToCreateSubUser(true);
account.setPermission(Integer.valueOf("1111",2)); account.setPermission(Integer.valueOf("1111", 2));
} else { } else {
account.setAllowedToCreateSubUser(user.isAllowedToCreateSubUser()); account.setAllowedToCreateSubUser(user.isAllowedToCreateSubUser());
account.setPermission(user.getPermission()); account.setPermission(user.getPermission());
...@@ -541,7 +542,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -541,7 +542,7 @@ public class AccountServiceImpl implements AccountService {
subUserPageResultDto.setUserList(subUsersDtoList); subUserPageResultDto.setUserList(subUsersDtoList);
PageInfo pageInfo = new PageInfo(); PageInfo pageInfo = new PageInfo();
pageInfo.setTotalItems((int)accounts.getTotalElements()); pageInfo.setTotalItems((int) accounts.getTotalElements());
pageInfo.setCurrentPage(accounts.getNumber()); pageInfo.setCurrentPage(accounts.getNumber());
pageInfo.setTotalPages(accounts.getTotalPages()); pageInfo.setTotalPages(accounts.getTotalPages());
subUserPageResultDto.setUserPage(pageInfo); subUserPageResultDto.setUserPage(pageInfo);
...@@ -601,7 +602,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -601,7 +602,7 @@ public class AccountServiceImpl implements AccountService {
return account; return account;
} }
public static String makeRandomPassword(int len){ public static String makeRandomPassword(int len) {
char charr[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~!@$%^&*.?".toCharArray(); char charr[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~!@$%^&*.?".toCharArray();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
Random r = new Random(); Random r = new Random();
...@@ -685,7 +686,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -685,7 +686,7 @@ public class AccountServiceImpl implements AccountService {
@Override @Override
public void saveSubUsers(String name, SubUsersRequestDto subUsersRequestDto) { public void saveSubUsers(String name, SubUsersRequestDto subUsersRequestDto) {
for (String username: subUsersRequestDto.getUsernames()) { for (String username : subUsersRequestDto.getUsernames()) {
Account childAccount = repository.findByName(username); Account childAccount = repository.findByName(username);
if (childAccount == null || !name.equals(childAccount.getParent())) { if (childAccount == null || !name.equals(childAccount.getParent())) {
throw new ClientRequestException(AccountErrorCode.UNKNOWN, "Invalid Request"); throw new ClientRequestException(AccountErrorCode.UNKNOWN, "Invalid Request");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment