Commit 067d01fe authored by zhuwei's avatar zhuwei

1

parent 2e046e26
...@@ -39,14 +39,16 @@ class CostDetail extends Basic ...@@ -39,14 +39,16 @@ class CostDetail extends Basic
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo']; $pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize']; $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
$activityModel = new CActivity(); $activityModel = new CActivity();
$field = 'id,';
$conditions = []; $conditions = [];
if (!empty($params["title"])) { // if (!empty($params["title"])) {
$conditions["title"] = array("like", "%" . trim($params['title']) . "%"); // $conditions["title"] = array("like", "%" . trim($params['title']) . "%");
} // }
if (!empty($params["id"])) { // if (!empty($params["id"])) {
$conditions["id"] = $params['id']; // $conditions["id"] = $params['id'];
} // }
$field = 'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name,
';
$list = $this->storeCostExt->getStoreCostExt($field, $conditions, $pageNo, $pageSize); $list = $this->storeCostExt->getStoreCostExt($field, $conditions, $pageNo, $pageSize);
$count = $this->storeCostExt->getStoreCostExtTotal($field, $conditions); $count = $this->storeCostExt->getStoreCostExtTotal($field, $conditions);
$result["list"] = $list; $result["list"] = $list;
......
...@@ -258,7 +258,7 @@ class StoreFee extends Basic ...@@ -258,7 +258,7 @@ class StoreFee extends Basic
$m_store = new AStore(); $m_store = new AStore();
$store_result = $m_store->getStore(['id'=>$params['store_id']], 'id'); $store_result = $m_store->getStore(['id'=>$params['store_id']], 'id');
if($store_result) if(!$store_result)
return $this->response("101", "该门店不存在"); return $this->response("101", "该门店不存在");
if ($params['office_id'] == 0) { if ($params['office_id'] == 0) {
......
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