Commit c3b2e282 by zhiwj

代码结构调整

parent 50dfd4bd
...@@ -1590,14 +1590,18 @@ public class StoreApiServiceImpl implements StoreApiService { ...@@ -1590,14 +1590,18 @@ public class StoreApiServiceImpl implements StoreApiService {
if(StringUtils.isNotBlank(storeSearchDTO.getStoreTags())){ if(StringUtils.isNotBlank(storeSearchDTO.getStoreTags())){
String[] arr = storeSearchDTO.getStoreTags().split(","); String[] arr = storeSearchDTO.getStoreTags().split(",");
List<TabStoreTag> storeTags = this.storeTagService.listByEnterprise(storeSearchDTO.getEnterpriseId()); List<TabStoreTag> storeTags = this.storeTagService.listByEnterprise(storeSearchDTO.getEnterpriseId());
storeTags.stream().filter(tag -> { List<Integer> storeWidgetList = storeTags.stream().filter(tag -> {
for (String s : arr) { for (String s : arr) {
if (tag.getStoreTagId().intValue() == Integer.valueOf(s)) { if (tag.getStoreTagId() == Integer.parseInt(s)) {
return true; return true;
} }
} }
return false; return false;
}).map(tag -> storeSearchDTO.getStoreResourceList().add(tag.getStoreTagId())); }).map(TabStoreTag::getStoreWidgetId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(storeSearchDTO.getStoreResourceList())){
storeSearchDTO.setStoreResourceList(new ArrayList<>());
}
storeSearchDTO.getStoreResourceList().addAll(storeWidgetList);
} }
String storeWidgetJson = this.buildStoreWidgetJson(storeSearchDTO.getStoreResource() == null ? null : storeSearchDTO.getStoreResource().intValue(), json, jsonObjectList); String storeWidgetJson = this.buildStoreWidgetJson(storeSearchDTO.getStoreResource() == null ? null : storeSearchDTO.getStoreResource().intValue(), json, jsonObjectList);
/*****如果存在没有门店权限的门店控件id,直接返回*****/ /*****如果存在没有门店权限的门店控件id,直接返回*****/
......
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