Merge branch 'icp-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into icp-deliver

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

@@ -42,6 +42,16 @@ class DeliverDao extends Dao {
                         ]
                         ]
                     }
                     }
                     break
                     break
+                case "/deliveryManagement/deliveryAllocated":
+                    qc.where.delivery_man_id = qc.where.delivery_man_id || {
+                        $and:[{$not:null},{$not:""}]
+                    }
+                    break
+                case "/deliveryManagement/deliveryNoAllocate":
+                    qc.where.delivery_man_id = qc.where.delivery_man_id || {
+                        $or: [{$eq:null} ,{$eq:""}]
+                    }
+                    break
                 case "/deliveryManagement/all":
                 case "/deliveryManagement/all":
                     break
                     break
             }
             }