Skip to content

Z
zhichan
Commit 4cb62cb4 by Sxy
Options

fix: 分配bug

parent 59db59e9
Showing with 12 additions and 22 deletions
icp-deliver/app/base/db/impl/delivery/deliverDao.js
...@@ -40,19 +40,15 @@ class DeliverDao extends Dao { ...@@ -40,19 +40,15 @@ class DeliverDao extends Dao {
} }
break break
case "/deliveryManagement/deliveryAllocated": case "/deliveryManagement/deliveryAllocated":
qc.where.delivery_man_id = qc.where.delivery_man_id || { qc.where.delivery_man_opcode = {
$and: [{ $not: null }, { $not: "" }] $and: [{ $not: null }, { $not: "" }]
} }
break break
case "/deliveryManagement/deliveryNoAllocate": case "/deliveryManagement/deliveryNoAllocate":
if (!qc.where['$or']) { qc.where['$or'] = [];
qc.where['$or'] = [] qc.where.delivery_man_opcode = {
$or: [{ $eq: null }, { $eq: "" }]
} }
qc.where['$or'].push({
delivery_man_opcode: {
$eq: null
}
})
break break
case "/deliveryManagement/all": case "/deliveryManagement/all":
break break
...@@ -127,14 +123,12 @@ class DeliverDao extends Dao { ...@@ -127,14 +123,12 @@ class DeliverDao extends Dao {
}); });
break break
case "/wangwenManagement/deliveryNoAllocate": case "/wangwenManagement/deliveryNoAllocate":
if (!qc.where['$or']) { qc.where['$or'] = [];
qc.where['$or'] = [] filters.push({
}
qc.where['$or'].push({
delivery_man_opcode: { delivery_man_opcode: {
$eq: null $eq: null
} }
}) });
break break
case "/wangwenManagement/all": case "/wangwenManagement/all":
break break
...@@ -161,14 +155,12 @@ class DeliverDao extends Dao { ...@@ -161,14 +155,12 @@ class DeliverDao extends Dao {
}); });
break break
case "/foodManagement/deliveryNoAllocate": case "/foodManagement/deliveryNoAllocate":
if (!qc.where['$or']) { qc.where['$or'] = [];
qc.where['$or'] = [] filters.push({
}
qc.where['$or'].push({
delivery_man_opcode: { delivery_man_opcode: {
$eq: null $eq: null
} }
}) });
break break
case "/foodManagement/all": case "/foodManagement/all":
break break
...@@ -195,14 +187,12 @@ class DeliverDao extends Dao { ...@@ -195,14 +187,12 @@ class DeliverDao extends Dao {
}); });
break break
case "/guangboManagement/deliveryNoAllocate": case "/guangboManagement/deliveryNoAllocate":
if (!qc.where['$or']) {
qc.where['$or'] = [] qc.where['$or'] = []
} filters.push({
qc.where['$or'].push({
delivery_man_opcode: { delivery_man_opcode: {
$eq: null $eq: null
} }
}) });
break break
case "/guangboManagement/all": case "/guangboManagement/all":
break break
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment