Commit d1ba1f08 authored by clone's avatar clone

bug

parent f3ee7a6c
...@@ -122,9 +122,9 @@ class OTaxes extends BaseModel ...@@ -122,9 +122,9 @@ class OTaxes extends BaseModel
*/ */
public function getTaxesId(int $taxesId, string $field) public function getTaxesId(int $taxesId, string $field)
{ {
$params["id|father_id"] = $taxesId; $params["father_id"] = $taxesId;
$params["is_del"] = 0; $params["is_del"] = 0;
$data = $this->field($field) $data = $this->field($field)
->where($params) ->where($params)
->select(); ->select();
...@@ -132,13 +132,14 @@ class OTaxes extends BaseModel ...@@ -132,13 +132,14 @@ class OTaxes extends BaseModel
$result = []; $result = [];
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
if (isset($v['role'])) { if (isset($v['role'])) {
$agent_name = $m_agent->getAgentInfo('id,name,phone', $v['agent_id']); $agent_name = $m_agent->getAgentInfo('id,name,phone', $v['agent_id']);
$result[$k]['id'] = $agent_name['id']; $result[$k]['id'] = $agent_name['id'];
$result[$k]['name'] = $agent_name['name']; $result[$k]['name'] = $agent_name['name'];
$result[$k]['phone'] = $agent_name['phone']; $result[$k]['phone'] = $agent_name['phone'];
$result[$k]['role'] = $v['role']; $result[$k]['role'] = $v['role'];
$result[$k]['scale'] = $v['scale']; $result[$k]['scale'] = $v['scale'];
$result[$k]['fee'] = $v['fee']; $result[$k]['fee'] = $v['fee'];
$result[$k]['total_fee'] = $v['total_fee'];
switch ($v['role']) { switch ($v['role']) {
case 1 : case 1 :
......
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