...
|
...
|
@@ -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;
|
|
|
};
|
|
|
|
|
|
/**
|
...
|
...
|
|