|
@@ -247,11 +247,16 @@ public class OrderBaseLogic {
|
|
|
.stream()
|
|
.stream()
|
|
|
.map(OrderBaseVO::getId)
|
|
.map(OrderBaseVO::getId)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
- final List<AdminWebsit> adminWebsits = adminWebsitService.lambdaQuery()
|
|
|
|
|
- .eq(AdminWebsit::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
|
|
|
|
|
- .in(AdminWebsit::getWebsitId, orderBaseVOS.stream().map(OrderBaseVO::getWebsitId).collect(Collectors.toList()))
|
|
|
|
|
- .list();
|
|
|
|
|
|
|
+ final List<AdminWebsit> adminWebsits = new ArrayList<>();
|
|
|
Map<String, String> adminWebsitMap = new HashMap<>();
|
|
Map<String, String> adminWebsitMap = new HashMap<>();
|
|
|
|
|
+
|
|
|
|
|
+ if (CollectionUtil.isNotEmpty(orderBaseVOS)) {
|
|
|
|
|
+ adminWebsitService.lambdaQuery()
|
|
|
|
|
+ .eq(AdminWebsit::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
|
|
|
|
|
+ .in(AdminWebsit::getWebsitId, orderBaseVOS.stream().map(OrderBaseVO::getWebsitId).collect(Collectors.toList()))
|
|
|
|
|
+ .list();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (CollectionUtil.isNotEmpty(adminWebsits)) {
|
|
if (CollectionUtil.isNotEmpty(adminWebsits)) {
|
|
|
adminWebsitMap = adminWebsits.stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, AdminWebsit::getAttr));
|
|
adminWebsitMap = adminWebsits.stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, AdminWebsit::getAttr));
|
|
|
}
|
|
}
|