Authored by yyq

Merge branch 'release/newSearch' of git.yoho.cn:fe/yohobuy-node into release/newSearch

... ... @@ -803,7 +803,14 @@ exports.handleFilterDataAll = (data, params) => {
let conditions = _.union(_.get(baseFilter, 'checkedConditions.conditions'),
_.get(seniorFilter, 'checkedConditions.conditions'));
return Object.assign({}, baseFilter, seniorFilter, {checkedConditions: {conditions: conditions}});
let destFilter = Object.assign({}, seniorFilter, baseFilter);
if (!destFilter.checkedConditions) {
destFilter.checkedConditions = {};
}
destFilter.checkedConditions.conditions = conditions;
return destFilter;
};
/**
... ...