Commit 4f41430f authored by renjie's avatar renjie

子用户bug

parent e8fb276a
......@@ -13,9 +13,8 @@ import java.util.List;
public class SubUsersRequestDto {
private int amount;
private String password;
private int permission;
private String nickname;
private int permisson = -1;
private int permission = -1;
private String comment;
private List<String> usernames;
private List<String> whiteList;
......@@ -36,13 +35,6 @@ public class SubUsersRequestDto {
this.amount = amount;
}
public int getPermission() {
return permission;
}
public void setPermission(int permission) {
this.permission = permission;
}
public String getNickname() {
return nickname;
......@@ -52,13 +44,6 @@ public class SubUsersRequestDto {
this.nickname = nickname;
}
public int getPermisson() {
return permisson;
}
public void setPermisson(int permisson) {
this.permisson = permisson;
}
public List<String> getUsernames() {
return usernames;
......@@ -83,4 +68,12 @@ public class SubUsersRequestDto {
public void setWhiteList(List<String> whiteList) {
this.whiteList = whiteList;
}
public int getPermission() {
return permission;
}
public void setPermission(int permission) {
this.permission = permission;
}
}
......@@ -785,6 +785,9 @@ public class AccountServiceImpl implements AccountService {
// user.setPassword(subUsersRequestDto.getPassword());
userAuthService.resetUserPassword(user);
}
log.error(subUsersRequestDto.getPermission() + "!");
if (subUsersRequestDto.getNickname() != null)
childAccount.setNickname(subUsersRequestDto.getNickname());
if (subUsersRequestDto.getPermission() != -1)
......
......@@ -196,7 +196,6 @@ public class ShopServiceImpl implements ShopService {
if (shopId == null) {
throw new ClientRequestException(AccountErrorCode.OTHERS);
}
logger.error(username, shopId);
UserShop userShop = userShopRepository.findByUsernameAndShopId(username, shopId);
if (account.getPermission() < 4 || userShop == null) {
throw new ClientRequestException(AccountErrorCode.NOPERMISSION);
......
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