diff --git a/app/adminapi/lists/approve/ApproveLists.php b/app/adminapi/lists/approve/ApproveLists.php index 1a1202593..51477fd3e 100644 --- a/app/adminapi/lists/approve/ApproveLists.php +++ b/app/adminapi/lists/approve/ApproveLists.php @@ -65,12 +65,12 @@ class ApproveLists extends BaseAdminDataLists implements ListsSearchInterface ->order(['id' => 'desc']) ->select() ->withAttr('area_manager',function($value,$data){ - return Admin::where(['id' => $data['check_admin_ids']])->value('name'); + $company = Company::where(['admin_id'=>$data['check_admin_ids']])->find(); + return Admin::where(['id' => $company['area_manager']])->value('name'); }) ->withAttr('company_name',function($value,$data){ - $extend = json_decode($data['extend'], true); - $company = Db::query("select * from la_company where FIND_IN_SET(:street,responsible_area)", ['street'=>$extend['street']], true); - return $company[0]['company_name']; + $company = Company::where(['admin_id'=>$data['check_admin_ids']])->find(); + return $company['company_name']; }) ->toArray(); $count = Approve::where($this->searchWhere)