diff --git a/app/api/controller/AccountLogController.php b/app/api/controller/AccountLogController.php index 278cb3d87..2e08527ce 100755 --- a/app/api/controller/AccountLogController.php +++ b/app/api/controller/AccountLogController.php @@ -76,6 +76,6 @@ class AccountLogController extends BaseApiController unset($data[$k]); } } - return $this->success('ok',$data); + return $this->success('ok',array_reverse($data)); } } diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index d5b45f94c..a1bd20e9b 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -27,6 +27,7 @@ class CompanyController extends BaseApiController $companies = $query->page($page)->limit($limit)->select()->each(function ($company) { $company['other_contacts'] = json_decode($company['other_contacts'], true); $company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : ''; + $company['company_type_name'] = Db::name('dict_data')->where('id', $company['company_type'])->value('name'); })->toArray(); return $this->success('', ['count' => $count, 'data' => $companies]); } diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php index 59fefe1b6..5cd05adbd 100644 --- a/app/api/controller/JunziqianController.php +++ b/app/api/controller/JunziqianController.php @@ -190,6 +190,10 @@ class JunziqianController extends BaseApiController public function download_file($applyNo){ $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); + $find=Db::name('contract')->where('contract_no',$applyNo)->value('contract_url'); + if($find){ + return $this->success('获取成功', ['url' => 'https://worker-task.lihaink.cn'.$find]); + } //初始化请求参数 $request=array( "applyNo" => $applyNo, //TODO +