fix: 未分配查询

icp-deliver/app/base/db/impl/delivery/deliverDao.js

@@ -53,31 +53,34 @@ class DeliverDao extends Dao {
           break;
           break;
         case '/deliveryManagement/deliveryAllocated':
         case '/deliveryManagement/deliveryAllocated':
           if (!qc.where.$and) {
           if (!qc.where.$and) {
-            qc.where.$and = []
+            qc.where.$and = [];
           }
           }
           qc.where.$and.push(...[{
           qc.where.$and.push(...[{
-            delivery_man_id: {
+            delivery_man_opcode: {
               $and: [{ $not: null }, { $not: '' }],
               $and: [{ $not: null }, { $not: '' }],
             }
             }
           }, {
           }, {
-            salesman_id: {
+            salesman_opcode: {
               $and: [{ $not: null }, { $not: '' }],
               $and: [{ $not: null }, { $not: '' }],
             }
             }
           }]);
           }]);
           break;
           break;
         case '/deliveryManagement/deliveryNoAllocate':
         case '/deliveryManagement/deliveryNoAllocate':
-          if (!qc.where.$or) {
-            qc.where.$or = []
+          delete qc.where.$or;
+          if (!qc.where.$and) {
+            qc.where.$and = [];
           }
           }
-          qc.where.$or.push(...[{
-            delivery_man_id: {
-              $or: [{ $eq: null }, { $eq: '' }],
-            }
-          }, {
-            salesman_id: {
-              $or: [{ $eq: null }, { $eq: '' }],
-            }
-          }]);
+          qc.where.$and.push({
+            $or: [{
+              delivery_man_opcode: {
+                $or: [{ $eq: null }, { $eq: '' }],
+              }
+            }, {
+              salesman_opcode: {
+                $or: [{ $eq: null }, { $eq: '' }],
+              }
+            }]
+          })
           break;
           break;
         case '/deliveryManagement/all':
         case '/deliveryManagement/all':
           break;
           break;