Commit 82e3b5a0 authored by renjie's avatar renjie

子用户权限

parent a8a41fe0
...@@ -29,7 +29,7 @@ public class AccountDto { ...@@ -29,7 +29,7 @@ public class AccountDto {
private boolean allowedToCreateSubUser; private boolean allowedToCreateSubUser;
private int permission = 0; private int permission = -1;
private int balance; private int balance;
......
...@@ -15,7 +15,7 @@ public class SubUsersRequestDto { ...@@ -15,7 +15,7 @@ public class SubUsersRequestDto {
private String password; private String password;
private int permission; private int permission;
private String nickname; private String nickname;
private int permisson; private int permisson = -1;
private String comment; private String comment;
private List<String> usernames; private List<String> usernames;
private List<String> whiteList; private List<String> whiteList;
......
...@@ -693,13 +693,19 @@ public class AccountServiceImpl implements AccountService { ...@@ -693,13 +693,19 @@ public class AccountServiceImpl implements AccountService {
authUser.setPassword(makeRandomPassword(8)); authUser.setPassword(makeRandomPassword(8));
authUser.setPhone(existing.getPhoneNumber()); authUser.setPhone(existing.getPhoneNumber());
authUser.setEnabled(true); authUser.setEnabled(true);
authUser.setPermission(subUsersRequestDto.getPermission()); if (subUsersRequestDto.getPermission() != -1)
authUser.setPermission(subUsersRequestDto.getPermission());
else
authUser.setPermission(0);
userAuthService.create(new com.edgec.browserbackend.auth.domain.User(authUser)); userAuthService.create(new com.edgec.browserbackend.auth.domain.User(authUser));
Account account = new Account(user); Account account = new Account(user);
account.setPhoneNumber(existing.getPhoneNumber()); account.setPhoneNumber(existing.getPhoneNumber());
account.setParent(name); account.setParent(name);
account.setPermission(subUsersRequestDto.getPermission()); if (subUsersRequestDto.getPermission() != -1)
account.setPermission(subUsersRequestDto.getPermission());
else
account.setPermission(0);
List<String> whiteList = new ArrayList<>(); List<String> whiteList = new ArrayList<>();
if (user.getWhiteList() != null && user.getWhiteList().size() > 0) if (user.getWhiteList() != null && user.getWhiteList().size() > 0)
whiteList.addAll(user.getWhiteList()); whiteList.addAll(user.getWhiteList());
......
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