Merge branch 'release/newSearch' of git.yoho.cn:fe/yohobuy-node into release/newSearch
Showing
1 changed file
with
8 additions
and
1 deletions
@@ -803,7 +803,14 @@ exports.handleFilterDataAll = (data, params) => { | @@ -803,7 +803,14 @@ exports.handleFilterDataAll = (data, params) => { | ||
803 | let conditions = _.union(_.get(baseFilter, 'checkedConditions.conditions'), | 803 | let conditions = _.union(_.get(baseFilter, 'checkedConditions.conditions'), |
804 | _.get(seniorFilter, 'checkedConditions.conditions')); | 804 | _.get(seniorFilter, 'checkedConditions.conditions')); |
805 | 805 | ||
806 | - return Object.assign({}, baseFilter, seniorFilter, {checkedConditions: {conditions: conditions}}); | 806 | + let destFilter = Object.assign({}, seniorFilter, baseFilter); |
807 | + | ||
808 | + if (!destFilter.checkedConditions) { | ||
809 | + destFilter.checkedConditions = {}; | ||
810 | + } | ||
811 | + destFilter.checkedConditions.conditions = conditions; | ||
812 | + | ||
813 | + return destFilter; | ||
807 | }; | 814 | }; |
808 | 815 | ||
809 | /** | 816 | /** |
-
Please register or login to post a comment