modules/route/back/methods/route/filter.js

@@ -96,16 +96,15 @@ module.exports = Self => {
                 return {'created': {gte: value}};
             case 'to':
                 return {'created': {lte: value}};
-            case 'm3':
-                return {'m3': value};
             case 'description':
                 return {'description': {like: `%${value}%`}};
+            case 'isOk':
+            case 'm3':
             case 'warehouseFk':
-                return {[param]: value};
+            case 'workerFk':
+            case 'vehicleFk':
             case 'agencyModeFk':
                 return {[param]: value};
-            case 'isOk':
-                return {'isOk': value};
             }
         });
 

modules/route/back/methods/route/getByWorker.js

@@ -28,11 +28,11 @@ module.exports = Self => {
         if (canViewAll) {
             const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
             filterGrant = {
-                where: {'a.warehouseFk': userConfig.warehouseFk}
+                where: {'warehouseFk': userConfig.warehouseFk}
             };
         } else {
             filterGrant = {
-                where: {'r.workerFk': userId}
+                where: {'workerFk': userId}
             };
         }
 
@@ -46,16 +46,16 @@ module.exports = Self => {
                 and: [
                     {
                         or: [
-                            {'r.created': currentDate},
+                            {'created': currentDate},
-                            {'r.created': nextDay}
+                            {'created': nextDay}
                         ]
                     }
                 ]
             },
             order: [
-                'r.created ASC',
+                'created ASC',
-                'r.time ASC',
+                'time ASC',
-                'am.name ASC'
+                'agencyName ASC'
             ]
         };