|
@@ -57,10 +57,16 @@ public class AddressCorrectionController {
|
|
|
for (AddressCorrection addressCorrection : listAllInfo){
|
|
|
|
|
|
Provider provider = iProviderService.selectByKey(addressCorrection.getStoreId());
|
|
|
- addressCorrection.setStoreName(provider.getName()); //设置店铺名称
|
|
|
+ if (provider != null){
|
|
|
+ addressCorrection.setStoreName(provider.getName()); //设置店铺名称
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
UserInfo userInfo = iUserInfoService.selectByKey(addressCorrection.getSubUserId());
|
|
|
- addressCorrection.setNickName(userInfo.getNickName());//设置用户昵称
|
|
|
+ if (userInfo != null){
|
|
|
+ addressCorrection.setNickName(userInfo.getNickName());//设置用户昵称
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
mav.addObject("pageInfo",new PageInfo<AddressCorrection>(listAllInfo));
|