Commit be8958ae authored by huangjiamin's avatar huangjiamin

Merge remote-tracking branch 'remotes/origin/feature-secondaryProxyPort' into staging

parents 49f676b5 8294ea1c
...@@ -361,7 +361,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -361,7 +361,7 @@ public class AccountServiceImpl implements AccountService {
current.setWhiteList(whiteList); current.setWhiteList(whiteList);
List<String> ownWhiteList = current.getOwnWhiteList(); List<String> ownWhiteList = current.getOwnWhiteList();
ownWhiteList.addAll(whiteList); ownWhiteList.addAll(whiteList);
current.setOwnWhiteList(ownWhiteList); current.setOwnWhiteList(ownWhiteList.stream().distinct().collect(Collectors.toList()));
if (account.getPromotion() != null) { if (account.getPromotion() != null) {
int invitedUsers = accountRepository.countByPromotionCodeAndParentIsNull(account.getPromotion().getCode()); int invitedUsers = accountRepository.countByPromotionCodeAndParentIsNull(account.getPromotion().getCode());
......
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