ad

app/admin/controller/OrderOutChild.php

@@ -101,12 +101,12 @@ class OrderOutChild extends Base
             $tmp = Db::name('warehouse_info')->field('id')->where(['is_del' => 0, 'contactor' => $this->uid])->findOrEmpty();
 
             //库管看到所有的库存品发货申请单
-            if (!empty($tmp)) $condition .= " or (a.order_type=1 AND c.contactor=" . $this->uid.")";
+            if (!empty($tmp)) $condition .= " and (a.order_type=1 AND c.contactor=" . $this->uid.")";
             else {
 //            	if($param['IsByMe']==0){
 	                 $role = $this->checkDataShare();
 	                if (!empty($role[DataGroupModel::$type_全部])) {
-	                    $condition .= " or (a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . "))";
+	                    $condition .= " and (a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . "))";
 	                }
 //            	}
 
@@ -129,8 +129,8 @@ class OrderOutChild extends Base
          	 //是否是仓库管理员
             $tmp = Db::name('warehouse_info')->field('id')->where(['is_del' => 0, 'contactor' => $this->uid])->findOrEmpty();
              //库管看到所有的库存品发货申请单
-            if (!empty($tmp)) $condition .= " or (a.order_type=1 AND c.contactor=" . $this->uid.")";
-             $condition .= " or (a.order_type <>1 )";
+            if (!empty($tmp)) $condition .= " and (a.order_type=1 AND c.contactor=" . $this->uid.")";
+             $condition .= " and (a.order_type <>1 )";
 
         }
 
@@ -231,7 +231,7 @@ class OrderOutChild extends Base
             $tmp = Db::name('warehouse_info')->field('id')->where(['is_del' => 0, 'contactor' => $this->uid])->findOrEmpty();
 
             //库管看到所有的库存品发货申请单
-            if (!empty($tmp)) $condition .= " or (a.order_type=1 AND c.contactor=" . $this->uid.")";
+            if (!empty($tmp)) $condition .= " and (a.order_type=1 AND c.contactor=" . $this->uid.")";
             else {
 //            	if($param['IsByMe']==0){
 	                 $role = $this->checkDataShare();
@@ -259,8 +259,8 @@ class OrderOutChild extends Base
          	 //是否是仓库管理员
             $tmp = Db::name('warehouse_info')->field('id')->where(['is_del' => 0, 'contactor' => $this->uid])->findOrEmpty();
              //库管看到所有的库存品发货申请单
-            if (!empty($tmp)) $condition .= " or (a.order_type=1 AND c.contactor=" . $this->uid.")";
-            $condition .= " or (a.order_type <>1 )";
+            if (!empty($tmp)) $condition .= " and (a.order_type=1 AND c.contactor=" . $this->uid.")";
+            $condition .= " and  (a.order_type <>1 )";
 
         }