From 877f643b873a219573d0461174483a2bb99a9198 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 21 Jul 2023 12:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E5=85=AC?=
=?UTF-8?q?=E5=8F=B8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/CompanyController.php | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index 2dc032313..80352dd59 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -5,6 +5,7 @@ namespace app\api\controller;
use app\common\model\auth\Admin;
use app\common\model\Company;
use app\common\model\contract\Contract;
+use think\facade\Db;
/**
* Class CompanyController
@@ -43,7 +44,26 @@ class CompanyController extends BaseApiController
$company = Company::findOrEmpty($admin['company_id'])->toArray();
$company['other_contacts'] = json_decode($company['other_contacts'], true);
$company['qualification'] = $company['qualification']!=null?json_decode($company['qualification'], true):'';
- return $this->success('', $company);
+ $contract = Contract::find($company['contract_id']);
+ if (empty($contract)) {
+ return $this->fail('合同不存在');
+ }
+ if($contract['admin_id']!=0){
+ $contract['party_b_name'] = Admin::where('id', $contract['admin_id'])->value('name');
+ }else{
+ $contract['party_b_name'] = Db::name('company')->where('id', $contract['party_b'])->value('company_name');
+ }
+ $contract['party_a_name'] = Db::name('company')->where('id', $contract['party_a'])->value('company_name');
+
+ $contract['contract_type_name'] = Db::name('dict_data')->where('id', $contract['contract_type'])->value('name');
+ $company['company_type_name'] = Db::name('dict_data')->where('id', $company['company_type'])->value('name');
+ $users = Admin::where('company_id', $company['id'])->field('id,name,account,phone,qualification')->select()->toArray();
+ foreach ($users as &$user) {
+ $user['is_main'] = $user['id'] == $company['admin_id'] ? 1 : 0;
+ $user['qualification'] =$user['qualification']!=null?json_decode($user['qualification'], true):[];
+ unset($user['role_id'], $user['dept_id'], $user['jobs_id'], $user['id']);
+ }
+ return $this->success('success', ['contract' => $contract, 'company' => $company, 'users' => $users]);
}
}
\ No newline at end of file