diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 7f338a9a6..211dbbd0b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -22,6 +22,7 @@ import com.cool.store.response.LicenseListResponse; import com.cool.store.response.SubmitLicenseResponse; import com.cool.store.service.ApplyLicenseService; import com.cool.store.service.RegionService; +import com.cool.store.utils.StringUtil; import com.cool.store.utils.poi.constant.Constants; import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.github.pagehelper.PageHelper; @@ -98,11 +99,16 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { SubmitLicenseResponse submitLicenseResponse = SubmitLicenseResponse.from(result); List listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode()); List userIds = listByShopIdAndType.stream().map(ShopAuditInfoDO::getSubmittedUserId).collect(Collectors.toList()); - List userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds); - Map userAvatarMap = userInfoByUserIds.stream().collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar())); - listByShopIdAndType.stream().forEach( item -> { - item.setAvatar(userAvatarMap.get(item.getSubmittedUserId())); - }); + List userInfoByUserIds = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(userIds)){ + userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds); + Map userAvatarMap = userInfoByUserIds.stream() + .filter(item -> StringUtil.isNotBlank(item.getUserId()) && StringUtil.isNotBlank(item.getAvatar())) + .collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar())); + listByShopIdAndType.stream().forEach( item -> { + item.setAvatar(userAvatarMap.get(item.getSubmittedUserId())); + }); + } submitLicenseResponse.setProcessRecords(listByShopIdAndType); return submitLicenseResponse; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index c66319b4d..21b531931 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -58,8 +58,7 @@ public class SignValidateFilter implements Filter { "/**/webjars/**", "/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery", "/xfsg/*/api/audit/result", - "/xfsg/mini/line/getRegionPayPic", - "/xfsg/mini/**" + "/xfsg/mini/line/getRegionPayPic" );