diff --git a/app/adminapi/logic/CompanyLogic.php b/app/adminapi/logic/CompanyLogic.php
index b4d585461..92cf62ec0 100644
--- a/app/adminapi/logic/CompanyLogic.php
+++ b/app/adminapi/logic/CompanyLogic.php
@@ -62,7 +62,7 @@ class CompanyLogic extends BaseLogic
                 'master_phone' => $params['master_phone'],
                 'master_email' => $params['master_email'],
                 'other_contacts' => $params['other_contacts'],
-                // 'area_manager' => $params['area_manager'],
+                'area_manager' => $params['area_manager'],
                 // 'is_contract' => $params['is_contract'],
                 // 'account' => $params['account'],
                 // 'password' => $params['password'],
@@ -111,7 +111,7 @@ class CompanyLogic extends BaseLogic
                 'master_phone' => $params['master_phone'],
                 'master_email' => $params['master_email'],
                 'other_contacts' => $params['other_contacts'],
-                // 'area_manager' => $params['area_manager'],
+                'area_manager' => $params['area_manager'],
                 // 'is_contract' => $params['is_contract'],
                 // 'account' => $params['account'],
                 // 'password' => $params['password'],
@@ -122,7 +122,9 @@ class CompanyLogic extends BaseLogic
                 'level_one' => $params['contract']['party_a'] ?? 0,
                 // 'status' => $params['status']
             ]);
-            self::contract($params['id'], $params);
+            if($params['contract']){
+                self::contract($params['id'], $params);
+            }
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -160,13 +162,12 @@ class CompanyLogic extends BaseLogic
         if($data){
             $data['other_contacts']=json_decode($data['other_contacts'],true);
             $data['qualification']=json_decode($data['qualification'],true);
+            $data['admin_name']=Db::name('admin')->where('id',$data['admin_id'])->value('name');
+            $data['area_manager_name']=Db::name('admin')->where('id',$data['area_manager'])->value('name');
             $data['contract']=Db::name('contract')->where('party_b',$data['id'])
             ->withAttr('party_a_name',function($value,$data){
                 return Db::name('company')->where('id',$data['party_a'])->value('company_name');
             })
-            // ->withAttr('contract_file_url',function($value,$data){
-            //     return Db::name('dict_data')->where('id',$data['contract_type_two'])->value('value');
-            // })
             ->find();
         }
         return $data;
diff --git a/app/adminapi/logic/auth/AdminLogic.php b/app/adminapi/logic/auth/AdminLogic.php
index 9fdc3f3f6..993a0a3c2 100755
--- a/app/adminapi/logic/auth/AdminLogic.php
+++ b/app/adminapi/logic/auth/AdminLogic.php
@@ -360,8 +360,8 @@ class AdminLogic extends BaseLogic
             $model->type = 2;
         }
         $model->update_time = time();
-        // $model->setAttrs($data);
-        $model->strict(false)->save($data);
+        $model->setAttrs($data);
+        $model->save($data);
     }
 
 }
\ No newline at end of file