From bb3f965dbacf23b52b4585c3bea300e2aacfb5f0 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 22 Jul 2023 10:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/CompanyLogic.php    | 12 +++++++++---
 app/adminapi/logic/auth/AdminLogic.php |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/logic/CompanyLogic.php b/app/adminapi/logic/CompanyLogic.php
index 5afc32b0b..be2725b29 100644
--- a/app/adminapi/logic/CompanyLogic.php
+++ b/app/adminapi/logic/CompanyLogic.php
@@ -73,7 +73,8 @@ class CompanyLogic extends BaseLogic
                 'level_one' => $params['contract']['party_a'] ?? 0,
                 // 'status' => $params['status']
             ]);
-            self::contract($data['id'], $params);
+            $contractId = self::contract($data['id'], $params);
+            Company::update(['contract_id' => $contractId], ['id' => $data['id']]);
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -123,7 +124,8 @@ class CompanyLogic extends BaseLogic
                 // 'status' => $params['status']
             ]);
             if($params['contract']){
-                self::contract($params['id'], $params);
+                $contractId = self::contract($params['id'], $params);
+                Company::update(['contract_id' => $contractId], ['id' => $params['id']]);
             }
             Db::commit();
             return true;
@@ -178,14 +180,18 @@ class CompanyLogic extends BaseLogic
         $model = Contract::where(['party_b'=>$companyId])->find();
         if (empty($model)) {
             $model = new Contract();
-            $model->party_b = $companyId;
             $model->contract_no = time();
             $model->create_time = time();
             $model->type = 1;
         }
         $model->update_time = time();
         $model->setAttrs($params['contract']);
+        $model->admin_id = $params['admin_id'];
+        $model->company_id = $companyId;
+        $model->party_a = $params['party_a'] ?? 0;
+        $model->party_b = $companyId;
         $model->save();
+        return $model->id;
     }
 
     public static function getAllCompanyIds()
diff --git a/app/adminapi/logic/auth/AdminLogic.php b/app/adminapi/logic/auth/AdminLogic.php
index 6bff97c38..34aa46275 100755
--- a/app/adminapi/logic/auth/AdminLogic.php
+++ b/app/adminapi/logic/auth/AdminLogic.php
@@ -56,6 +56,7 @@ class AdminLogic extends BaseLogic
             $params['avatar'] = $avatar;
             $params['password'] = $password;
             $params['create_time'] = time();
+            $params['company_id'] = $params['party_a'];
             $admin_id = Admin::strict(false)->field(true)->insertGetId($params);
             // 角色
             self::insertRole($admin_id, explode(',',$params['role_id']) ?? []);