Commit 6194bfef authored by renjie's avatar renjie

子用户权限bug

parent df3f74a5
...@@ -25,6 +25,7 @@ import org.springframework.data.domain.Page; ...@@ -25,6 +25,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert; import org.springframework.util.Assert;
...@@ -652,6 +653,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -652,6 +653,7 @@ public class AccountServiceImpl implements AccountService {
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());
repository.save(account); repository.save(account);
// emailService.sendEmailVerification(user.getUsername(), user.getEmail(), user.getVerificationCode()); // emailService.sendEmailVerification(user.getUsername(), user.getEmail(), user.getVerificationCode());
...@@ -688,7 +690,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -688,7 +690,7 @@ public class AccountServiceImpl implements AccountService {
if (subUsersRequestDto.getPassword() != null) { if (subUsersRequestDto.getPassword() != null) {
com.edgec.browserbackend.auth.domain.User user = new com.edgec.browserbackend.auth.domain.User(); com.edgec.browserbackend.auth.domain.User user = new com.edgec.browserbackend.auth.domain.User();
user.setUsername(username); user.setUsername(username);
user.setPassword(subUsersRequestDto.getPassword()); // user.setPassword(subUsersRequestDto.getPassword());
userAuthService.resetUserPassword(user); userAuthService.resetUserPassword(user);
} }
if (subUsersRequestDto.getNickname() != null) if (subUsersRequestDto.getNickname() != null)
......
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