From 96e2673ad387e45040ace0a5ed1c1b6d6e447659 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 17 Nov 2023 13:51:13 +0800
Subject: [PATCH 1/2] fixed

---
 app/adminapi/lists/approve/ApproveLists.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/lists/approve/ApproveLists.php b/app/adminapi/lists/approve/ApproveLists.php
index 1a1202593..37475f3e6 100644
--- a/app/adminapi/lists/approve/ApproveLists.php
+++ b/app/adminapi/lists/approve/ApproveLists.php
@@ -68,9 +68,8 @@ class ApproveLists extends BaseAdminDataLists implements ListsSearchInterface
                 return Admin::where(['id' => $data['check_admin_ids']])->value('name');
             })
             ->withAttr('company_name',function($value,$data){
-                $extend = json_decode($data['extend'], true);
-                $company = Db::query("select * from la_company where  FIND_IN_SET(:street,responsible_area)", ['street'=>$extend['street']], true);
-                return $company[0]['company_name'];
+                $company = Company::where(['admin_id'=>$data['check_admin_ids']])->find();
+                return $company['company_name'];
             })
             ->toArray();
         $count = Approve::where($this->searchWhere)

From 746b9dcb3714c96d752e510c8037b2f3f179524a Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 17 Nov 2023 13:53:31 +0800
Subject: [PATCH 2/2] fixed

---
 app/adminapi/lists/approve/ApproveLists.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/lists/approve/ApproveLists.php b/app/adminapi/lists/approve/ApproveLists.php
index 37475f3e6..51477fd3e 100644
--- a/app/adminapi/lists/approve/ApproveLists.php
+++ b/app/adminapi/lists/approve/ApproveLists.php
@@ -65,7 +65,8 @@ class ApproveLists extends BaseAdminDataLists implements ListsSearchInterface
             ->order(['id' => 'desc'])
             ->select()
             ->withAttr('area_manager',function($value,$data){
-                return Admin::where(['id' => $data['check_admin_ids']])->value('name');
+                $company = Company::where(['admin_id'=>$data['check_admin_ids']])->find();
+                return Admin::where(['id' => $company['area_manager']])->value('name');
             })
             ->withAttr('company_name',function($value,$data){
                 $company = Company::where(['admin_id'=>$data['check_admin_ids']])->find();