|
@@ -234,10 +234,10 @@ class OrderOutChild extends Base
|
|
|
if (!empty($tmp)) $condition .= " and (a.order_type=1 AND c.contactor=" . $this->uid.")";
|
|
|
else {
|
|
|
|
|
|
- $role = $this->checkDataShare();
|
|
|
- if (!empty($role[DataGroupModel::$type_全部])) {
|
|
|
- $condition .= " or (a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . "))";
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
}
|
|
@@ -254,15 +254,15 @@ class OrderOutChild extends Base
|
|
|
|
|
|
|
|
|
}
|
|
|
- if ($this->level == 3) {
|
|
|
-
|
|
|
-
|
|
|
- $tmp = Db::name('warehouse_info')->field('id')->where(['is_del' => 0, 'contactor' => $this->uid])->findOrEmpty();
|
|
|
-
|
|
|
- if (!empty($tmp)) $condition .= " and (a.order_type=1 AND c.contactor=" . $this->uid.")";
|
|
|
- $condition .= " and (a.order_type <>1 )";
|
|
|
-
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
$list = Db::name('order_out_child')
|
|
|
->alias('a')
|