Skip to content

G
gic-data-cloud
Commit 0b66f4ae by zhiwj
Options

Merge branch 'developer' of… 

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
parents b7501a20 d3e48bd7
Showing with 2 additions and 2 deletions
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreWidgetController.java
...@@ -298,8 +298,8 @@ public class StoreWidgetController { ...@@ -298,8 +298,8 @@ public class StoreWidgetController {
StoreSearchVo searchVo = new StoreSearchVo(); StoreSearchVo searchVo = new StoreSearchVo();
searchVo.setId(storeDTO.getStoreInfoId()+""); searchVo.setId(storeDTO.getStoreInfoId()+"");
searchVo.setName(storeDTO.getStoreName()); searchVo.setName(storeDTO.getStoreName());
searchVo.setIdChain(map.get(storeDTO.getStoreGroupId()).getIdChain() + storeDTO.getStoreInfoId()+"_"); searchVo.setIdChain(map.get(storeDTO.getStoreGroupId()) != null ? map.get(storeDTO.getStoreGroupId()).getIdChain() : "" + storeDTO.getStoreInfoId()+"_");
searchVo.setNameChain(map.get(storeDTO.getStoreGroupId()).getNameChain() + storeDTO.getStoreName() + "/"); searchVo.setNameChain(map.get(storeDTO.getStoreGroupId())!= null ? map.get(storeDTO.getStoreGroupId()).getNameChain() : "" + storeDTO.getStoreName() + "/");
searchVo.setHasAttention(attentionStoreDTOMap.get(storeDTO.getStoreInfoId()) == null ? 0 : 1); searchVo.setHasAttention(attentionStoreDTOMap.get(storeDTO.getStoreInfoId()) == null ? 0 : 1);
storeSearchVoList.add(searchVo); storeSearchVoList.add(searchVo);
} }
......
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