fix: bug

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

@@ -5,10 +5,10 @@ class DeliverDao extends Dao {
     constructor() {
     constructor() {
         super(Dao.getModelName(DeliverDao));
         super(Dao.getModelName(DeliverDao));
     }
     }
-    orderBy () {
+    orderBy() {
         return [["updated_at", "DESC"]];
         return [["updated_at", "DESC"]];
     }
     }
-    extraWhere (qobj, qw, qc) {
+    extraWhere(qobj, qw, qc) {
 
 
         // 权限添加 
         // 权限添加 
         //需要添加公司查询条件
         //需要添加公司查询条件
@@ -40,12 +40,19 @@ 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_id = qc.where.delivery_man_id || {
-                        $and:[{$not:null},{$not:""}]
+                        $and: [{ $not: null }, { $not: "" }]
                     }
                     }
                     break
                     break
                 case "/deliveryManagement/deliveryNoAllocate":
                 case "/deliveryManagement/deliveryNoAllocate":
                     qc.where.delivery_man_id = qc.where.delivery_man_id || {
                     qc.where.delivery_man_id = qc.where.delivery_man_id || {
-                        $or: [{$eq:null} ,{$eq:""}]
+                        $or: [{ $eq: null }, { $eq: "" }]
+                    }
+                    if (qc.where['$or']) {
+                        qc.where['$or'].push({
+                            salesman_opcode: {
+                                $eq: null
+                            }
+                        })
                     }
                     }
                     break
                     break
                 case "/deliveryManagement/all":
                 case "/deliveryManagement/all":
@@ -105,7 +112,7 @@ class DeliverDao extends Dao {
         return qw;
         return qw;
     }
     }
 
 
-    async findInfo (pobj) {
+    async findInfo(pobj) {
         const result = await this.model.findOne({
         const result = await this.model.findOne({
             where: {
             where: {
                 id: pobj.id
                 id: pobj.id
@@ -124,7 +131,7 @@ class DeliverDao extends Dao {
         });
         });
         return result;
         return result;
     }
     }
-    async findAnnualReportInfo (pobj) {
+    async findAnnualReportInfo(pobj) {
         const result = await this.model.findOne({
         const result = await this.model.findOne({
             where: {
             where: {
                 id: pobj.id
                 id: pobj.id