|
|
@@ -13,28 +13,16 @@ class GoodOfflineLog extends Base
|
|
|
public function getList()
|
|
|
{
|
|
|
|
|
|
- $param = $this->request->only(['start_date' => '','companyNo' => '','supplierNo' => '','relaComNo' => '', "spuCode"=>'',"good_name"=>'','end_date' => '', 'creater' => '', 'page' => 1,'size' => 15], 'post', 'trim');
|
|
|
+ $param = $this->request->only(['start_date' => '',"type"=>1,'companyNo' => '','supplierNo' => '','relaComNo' =>
|
|
|
+ '', "spuCode"=>'',"good_name"=>'','end_date' => '', 'creater' => '', 'page' => 1,'size' => 15], 'post', 'trim');
|
|
|
|
|
|
- $where = [];
|
|
|
+ $where = [["a.type","=",$param["type"]]];
|
|
|
if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'], $param['end_date']]];
|
|
|
if ($param['creater'] != '') $where[] = ['a.creater', 'like', '%' . $param['creater'] . '%'];
|
|
|
if ($param['spuCode'] != '') $where[] = ['a.spuCode', 'like', '%' . $param['spuCode'] . '%'];
|
|
|
if ($param['good_name'] != '') $where[] = ['a.good_name', 'like', '%' . $param['good_name'] . '%'];
|
|
|
if ($param['companyNo'] != '') $where[] = ['b.companyNo', 'like', '%' . $param['companyNo'] . '%'];
|
|
|
if ($param['supplierNo'] != '') $where[] = ['b.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
|
|
|
-// if ($param['relaComNo'] != '') $where[] = ['b.companyNo|b.supplierNo', 'like', '%' . $param['relaComNo'] . '%'];
|
|
|
-// $role = $this->checkDataShare();
|
|
|
-// if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["createrid", "in", $role[DataGroupModel::$type_全部]];
|
|
|
-
|
|
|
- //只有level2的账号过滤数据权限
|
|
|
-// if ($this->level == 2) {
|
|
|
-// $role = $this->checkDataShare();
|
|
|
-// $hand = resign_hand_user($this->uid, 0);
|
|
|
-// if (!empty($role[DataGroupModel::$type_全部])) {
|
|
|
-// $arr = array_unique(array_merge($hand, $role[DataGroupModel::$type_全部]));
|
|
|
-// $where[] = ['a.createrid', 'in', $arr];
|
|
|
-// }
|
|
|
-// }
|
|
|
|
|
|
$count = Db::name('good_offline_log')
|
|
|
->alias("a")
|
