|
@@ -129,12 +129,12 @@ class CrudService extends NafService {
|
|
|
const type = karr[1];
|
|
|
if (type === 'start') {
|
|
|
if (filter[k] && filter[k] !== '') {
|
|
|
- const obj = { key: prefix, opera: '$gte', value: new Date(filter[k]).toISOString() };
|
|
|
+ const obj = { key: prefix, opera: '$gte', value: new Date(filter[k]) };
|
|
|
times.push(obj);
|
|
|
}
|
|
|
} else {
|
|
|
if (filter[k] && filter[k] !== '') {
|
|
|
- const obj = { key: prefix, opera: '$lte', value: new Date(filter[k]).toISOString() };
|
|
|
+ const obj = { key: prefix, opera: '$lte', value: new Date(filter[k]) };
|
|
|
times.push(obj);
|
|
|
}
|
|
|
}
|
|
@@ -144,11 +144,10 @@ class CrudService extends NafService {
|
|
|
}
|
|
|
for (const i of times) {
|
|
|
const { key, opera, value } = i;
|
|
|
- const obj = { [key]: { [opera]: value } };
|
|
|
- if (!filter.$and) {
|
|
|
- filter.$and = [];
|
|
|
+ if (!filter[key]) {
|
|
|
+ filter[key] = {};
|
|
|
}
|
|
|
- filter.$and.push(obj);
|
|
|
+ filter[key][opera] = value;
|
|
|
}
|
|
|
return filter;
|
|
|
}
|