fix: 分配页面列表

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

@@ -52,22 +52,32 @@ class DeliverDao extends Dao {
           };
           break;
         case '/deliveryManagement/deliveryAllocated':
-          qc.where.delivery_man_id = qc.where.delivery_man_id || {
-            $and: [{ $not: null }, { $not: '' }],
-          };
+          if (!qc.where.$and) {
+            qc.where.$and = []
+          }
+          qc.where.$and.push(...[{
+            delivery_man_id: {
+              $and: [{ $not: null }, { $not: '' }],
+            }
+          }, {
+            salesman_id: {
+              $and: [{ $not: null }, { $not: '' }],
+            }
+          }]);
           break;
         case '/deliveryManagement/deliveryNoAllocate':
           if (!qc.where.$or) {
             qc.where.$or = []
           }
-          qc.where.$or.push({
+          qc.where.$or.push(...[{
             delivery_man_id: {
               $or: [{ $eq: null }, { $eq: '' }],
-            },
+            }
+          }, {
             salesman_id: {
               $or: [{ $eq: null }, { $eq: '' }],
             }
-          });
+          }]);
           break;
         case '/deliveryManagement/all':
           break;