Commit 80bc3a4c authored by renjie's avatar renjie

ipdetail bug

parent 6aae1d14
...@@ -729,6 +729,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -729,6 +729,7 @@ public class AccountServiceImpl implements AccountService {
password = subUsersRequestDto.getPassword(); password = subUsersRequestDto.getPassword();
else else
password = makeRandomPassword(8); password = makeRandomPassword(8);
authUser.setPassword(password); authUser.setPassword(password);
authUser.setPhone(existing.getPhoneNumber()); authUser.setPhone(existing.getPhoneNumber());
authUser.setEnabled(true); authUser.setEnabled(true);
......
...@@ -634,7 +634,9 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -634,7 +634,9 @@ public class IpResourceServiceImpl implements IpResourceService {
throw new ClientRequestException(BrowserErrorCode.IPNOTEXIST); throw new ClientRequestException(BrowserErrorCode.IPNOTEXIST);
ShopDto shopDto; ShopDto shopDto;
Shop shop = shopRepository.findById(ipResource.getShopId()).orElse(null); Shop shop = null;
if (ipResource.getShopId() != null)
shop = shopRepository.findById(ipResource.getShopId()).orElse(null);
if (shop == null) { if (shop == null) {
shopDto = new ShopDto(); shopDto = new ShopDto();
} else { } else {
......
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