diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index a1826e6d2..1ce408545 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -20,8 +20,7 @@ class CompanyController extends BaseApiController
     public function index()
     {
         [$page, $limit] = $this->getPage();
-        $admin = Admin::findOrEmpty($this->userInfo['admin_id']);
-        $myCompany = Company::findOrEmpty($admin['company_id'])->toArray();
+        $myCompany = Company::findOrEmpty($this->userInfo['company_id'])->toArray();
         $companyIds = Contract::where('party_a', $myCompany['id'])->column('party_b');
         $query = Company::whereIn('id', $companyIds)->append(['province_name', 'city_name', 'area_name', 'street_name', 'area_manager_name']);
         $count = $query->count();
@@ -37,11 +36,13 @@ class CompanyController extends BaseApiController
     {
         $id = $this->request->param('id', 0);
         if (empty($id)) {
-            $admin = Admin::findOrEmpty($this->userInfo['admin_id']);
-            $query = Company::find($admin['company_id']);
+            $query = Company::find($this->userInfo['company_id']);
         } else {
             $query = Company::find($id);
         }
+        if(!$query){
+            return $this->fail('公司不存在');
+        }
         $company = $query->append(['province_name', 'city_name', 'area_name', 'street_name', 'area_manager_name'])->toArray();
         $company['other_contacts'] = json_decode($company['other_contacts'], true);
         $company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : '';
@@ -69,8 +70,7 @@ class CompanyController extends BaseApiController
     public function areaManager()
     {
         [$page, $limit] = $this->getPage();
-        $admin = Admin::find($this->userInfo['admin_id']);
-        $company = Company::find($admin['company_id']);
+        $company = Company::find($this->userInfo['company_id']);
         $query = Admin::where('id', $company['area_manager']);
         $count = $query->count();
         $data = $query->page($page)->limit($limit)->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,name,account,avatar,province,city,area,street')->select()->toArray();
@@ -80,8 +80,11 @@ class CompanyController extends BaseApiController
     public function users()
     {
         [$page, $limit] = $this->getPage();
-        $companyId = $this->request->param('company_id', 0);
-        $query = User::where('company_id', $companyId);
+        // $companyId = $this->request->param('company_id', 0);
+        // if($companyId==0){
+        //     $companyId=$this->userInfo['company_id'];
+        // }
+        $query = User::where('company_id', $this->userInfo['company_id']);
         $count = $query->count();
         $users = $query->page($page)->limit($limit)->with(['company' => function ($query) {
             $query->field('id,company_name');
@@ -95,14 +98,14 @@ class CompanyController extends BaseApiController
 
     public function user($id)
     {
-        $query = Admin::where('id', $id);
+        $query = User::where('id', $id);
         $user = $query->with(['company' => function ($query) {
             $query->field('id,company_name');
-        }])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,sex,avatar,name,account,phone,id_card,qualification,province,city,area,street,is_contract,company_id')->find()->toArray();
+        }])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,sex,avatar,nickname name,account,mobile phone,id_card,qualification,province,city,area,street,is_contract,company_id')->find()->toArray();
         $contract = Contract::whereRaw("(type=1 and party_b={$user['company_id']}) or (type=2 and party_b={$user['id']})")->append(['contract_type_name'])->find();
         $user['contract'] = $contract;
-        $roleIds = AdminRole::where('admin_id', $user['id'])->column('role_id');
-        $user['roles'] = SystemRole::whereIn('id', $roleIds)->column('name');
+        // $roleIds = AdminRole::where('admin_id', $user['id'])->column('role_id');
+        // $user['roles'] = SystemRole::whereIn('id', $roleIds)->column('name');
         $user['qualification'] = $user['qualification'] != null ? json_decode($user['qualification'], true) : [];
         unset($user['role_id'], $user['dept_id'], $user['jobs_id']);
         return $this->success('success', $user);
diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php
index 4ae4a7a0c..9dec243b7 100644
--- a/app/api/controller/InformationController.php
+++ b/app/api/controller/InformationController.php
@@ -11,7 +11,11 @@ class InformationController extends BaseApiController
     {
         $param = Request()->param();
         [$page, $limit] = $this->getPage();
-        $data['create_user_id'] = $this->userId;
+        if(isset($param['user_id'])&&$param['user_id']>0){
+            $data['create_user_id'] = $param['user_id'];
+        }else{
+            $data['company_id'] = $this->userInfo['company_id'];
+        }
         $res = UserInformationg::list($data,$page,$limit);
         if ($res != true) {
             return $this->fail( BaseLogic::getError());
@@ -23,6 +27,7 @@ class InformationController extends BaseApiController
     {
         $param = Request()->param();
         $param['admin_id'] = $this->userId;
+        $param['company_id']=$this->userInfo['company_id'];
         $res = UserInformationg::add($param);
         if ($res != true) {
             return $this->fail( BaseLogic::getError());
diff --git a/vendor/ebaoquan/junziqian_sdk b/vendor/ebaoquan/junziqian_sdk
index 9acc82cd2..1294ea49f 160000
--- a/vendor/ebaoquan/junziqian_sdk
+++ b/vendor/ebaoquan/junziqian_sdk
@@ -1 +1 @@
-Subproject commit 9acc82cd23d807280ddd29df2117e7890094d049
+Subproject commit 1294ea49ff9ecc4532821f8798304816cbf8dd74