From e606fe2bd33b30720e76c20840bf09cf46d5c0e5 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 18 Aug 2023 12:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=AC=E5=8F=B8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php           | 8 +++++++-
 app/adminapi/controller/contract/ContractController.php | 3 ++-
 app/adminapi/logic/auth/AdminLogic.php                  | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index b8c559e84..69a10b5f8 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -17,6 +17,7 @@ namespace app\adminapi\controller;
 
 
 use app\adminapi\lists\CompanyLists;
+use app\adminapi\logic\auth\AdminLogic;
 use app\common\logic\CompanyLogic;
 use app\adminapi\validate\CompanyValidate;
 use app\api\controller\JunziqianController;
@@ -25,6 +26,7 @@ use app\common\model\Company;
 use think\facade\Db;
 use app\common\logic\contract\ContractLogic;
 use app\common\model\contract\Contract;
+use app\common\model\task_scheduling\TaskScheduling;
 use app\common\model\user\User;
 
 /**
@@ -106,6 +108,10 @@ class CompanyController extends BaseAdminController
     public function delete()
     {
         $params = (new CompanyValidate())->post()->goCheck('delete');
+        $admin_id=Company::where('id', $params['id'])->value('admin');
+        User::where('company_id',$params['id'])->update(['delete_time'=>time()]);
+        TaskScheduling::where('company_id',$params['id'])->update(['delete_time'=>time()]);
+        AdminLogic::delete(['id'=>$admin_id]);
         CompanyLogic::delete($params);
         return $this->success('删除成功', [], 1, 1);
     }
@@ -232,7 +238,7 @@ class CompanyController extends BaseAdminController
     {
         $ids=Contract::where('party_a',$company_id)->where('status',1)->where('type',1)->column('party_b');
         if($ids){
-            $result=Company::where('id','in',$ids)->field('company_name,id,company_type,area,area area_name,street,street street_name,is_contract,area_manager,area_manager area_manager_name,master_name,master_phone')->select();
+            $result=Company::where('id','in',$ids)->field('company_name,id,company_type,company_type company_type_name,area,area area_name,street,street street_name,is_contract,area_manager,area_manager area_manager_name,master_name,master_phone,is_authentication')->select();
         }else{
             $result=[];
         }
diff --git a/app/adminapi/controller/contract/ContractController.php b/app/adminapi/controller/contract/ContractController.php
index 09787a886..dd4ec7e8d 100644
--- a/app/adminapi/controller/contract/ContractController.php
+++ b/app/adminapi/controller/contract/ContractController.php
@@ -26,6 +26,7 @@ use think\facade\Db;
 use app\api\logic\SmsLogic;
 use app\api\controller\JunziqianController;
 use app\common\model\Company;
+use app\common\model\user\User;
 
 /**
  * 合同控制器
@@ -120,7 +121,7 @@ class ContractController extends BaseAdminController
             if($find['type']==1){
                 $find['party_b_info'] =Company::where('id', $find['party_b'])->field('company_name name,master_phone phone')->find()->toArray();
             }else{
-                $find['party_b_info'] =Db::name('user')->where('id', $find['party_b'])->field('nickname name,mobile phone')->find()->toArray();
+                $find['party_b_info'] =User::where('id', $find['party_b'])->field('nickname name,mobile phone')->find()->toArray();
             }
             $a = [
                 'mobile' => $find['party_a_info']['master_phone'],
diff --git a/app/adminapi/logic/auth/AdminLogic.php b/app/adminapi/logic/auth/AdminLogic.php
index 9bafa654e..8d6c9ca70 100755
--- a/app/adminapi/logic/auth/AdminLogic.php
+++ b/app/adminapi/logic/auth/AdminLogic.php
@@ -188,7 +188,7 @@ class AdminLogic extends BaseLogic
             AdminDept::delByUserId($params['id']);
             AdminJobs::delByUserId($params['id']);
            //修改用户同步信息
-           Db::name('user')->where(['admin_id'=>$params['id']])->update(['is_disable'=>1]);
+           Db::name('user')->where(['admin_id'=>$params['id']])->update(['delete_time'=>time()]);
             Db::commit();
             return true;
         } catch (\Exception $e) {