Commit 418fbd18 by 陶光胜

门店控件修复

parent d7ca81d8
......@@ -104,7 +104,7 @@ public class GoDownComponent {
List<Integer> childrenStoreGroupIdList = this.storeSearchUtils.getChildrenStoreGroupIdList(params.getEnterpriseId(), params.getParentId(), params.getLevel(), params.getChannel());
params.setGroupIdList(childrenStoreGroupIdList);
/****首页进入基础页面时,如果渠道为空,根据当前条件判断渠道,channel==null表示多渠道***/
if(params.getChannel() == null){
if(params.getChannel() == Constants.ZERO){
/**********设置层级名称,只有在首次进入页面会展示,下钻均显示返回上一级*********/
Integer newChannel = this.storeSearchUtils.getChannel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
params.setChannel(newChannel);
......@@ -129,7 +129,7 @@ public class GoDownComponent {
public void setValueTotal(AbstractCommonQo params, LevelVo levelVo){
Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
/**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
boolean isContainNoOwnership = (params.getChannel() == null || (StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel()) && params.getLevel().intValue() == levelVo.getLevel())) && wgs == 1;
boolean isContainNoOwnership = (params.getChannel() == Constants.ZERO || (StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel()) && params.getLevel().intValue() == levelVo.getLevel())) && wgs == 1;
if(isContainNoOwnership){
if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
params.setStoreInfoIdList(new ArrayList<>());
......@@ -144,7 +144,7 @@ public class GoDownComponent {
public void setValueTotalForArea(AbstractCommonQo params, LevelVo levelVo){
/**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
boolean isContainNoOwnership = (params.getChannel() == null || (StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel()) && params.getLevel().intValue() == levelVo.getLevel()));
boolean isContainNoOwnership = (params.getChannel() == Constants.ZERO || (StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel()) && params.getLevel().intValue() == levelVo.getLevel()));
if(isContainNoOwnership){
if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
params.setStoreInfoIdList(new ArrayList<>());
......
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