From 1261d498897f7b578ff4f25f808366dfbdd904c7 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 19 Mar 2024 14:17:55 +0800
Subject: [PATCH] update

---
 .../lists/custom/CustomerDemandLists.php      |  8 ------
 .../custom/CustomerDemandSolutionLists.php    | 10 +------
 .../lists/project/CompetitorLists.php         |  8 ------
 .../lists/project/ProjectEstimateLists.php    |  8 ------
 .../lists/project/ProjectFollowUpLists.php    |  8 ------
 app/adminapi/lists/project/ProjectLists.php   | 16 ++---------
 .../project/ProjectPreSalesMembersLists.php   | 28 ++-----------------
 7 files changed, 6 insertions(+), 80 deletions(-)

diff --git a/app/adminapi/lists/custom/CustomerDemandLists.php b/app/adminapi/lists/custom/CustomerDemandLists.php
index 68d88217f..a6ed88ade 100644
--- a/app/adminapi/lists/custom/CustomerDemandLists.php
+++ b/app/adminapi/lists/custom/CustomerDemandLists.php
@@ -62,10 +62,6 @@ class CustomerDemandLists extends BaseAdminDataLists implements ListsSearchInter
     {
 		$params = $this->request->param();
 		$where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
 	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
 			$customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
@@ -97,10 +93,6 @@ class CustomerDemandLists extends BaseAdminDataLists implements ListsSearchInter
     {
 	    $params = $this->request->param();
 	    $where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
 	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
 		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
diff --git a/app/adminapi/lists/custom/CustomerDemandSolutionLists.php b/app/adminapi/lists/custom/CustomerDemandSolutionLists.php
index aa0761dff..648ce9bf4 100644
--- a/app/adminapi/lists/custom/CustomerDemandSolutionLists.php
+++ b/app/adminapi/lists/custom/CustomerDemandSolutionLists.php
@@ -42,7 +42,7 @@ class CustomerDemandSolutionLists extends BaseAdminDataLists implements ListsSea
     public function setSearch(): array
     {
         return [
-			'=' => ['project_id','customer_demand_id'],
+			'=' => ['project_id'],
             '%like%' => ['theme'],
         ];
     }
@@ -61,10 +61,6 @@ class CustomerDemandSolutionLists extends BaseAdminDataLists implements ListsSea
     {
 	    $params = $this->request->param();
 	    $where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
 	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
 		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
@@ -101,10 +97,6 @@ class CustomerDemandSolutionLists extends BaseAdminDataLists implements ListsSea
     {
 	    $params = $this->request->param();
 	    $where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
 	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
 		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
diff --git a/app/adminapi/lists/project/CompetitorLists.php b/app/adminapi/lists/project/CompetitorLists.php
index 7f0f17687..efe23c335 100644
--- a/app/adminapi/lists/project/CompetitorLists.php
+++ b/app/adminapi/lists/project/CompetitorLists.php
@@ -61,10 +61,6 @@ class CompetitorLists extends BaseAdminDataLists implements ListsSearchInterface
     {
 	    $params = $this->request->param();
 	    $where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
 	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
 		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
@@ -101,10 +97,6 @@ class CompetitorLists extends BaseAdminDataLists implements ListsSearchInterface
     {
 	    $params = $this->request->param();
 	    $where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
 	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
 		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
diff --git a/app/adminapi/lists/project/ProjectEstimateLists.php b/app/adminapi/lists/project/ProjectEstimateLists.php
index a2cb3180c..2655b66c8 100644
--- a/app/adminapi/lists/project/ProjectEstimateLists.php
+++ b/app/adminapi/lists/project/ProjectEstimateLists.php
@@ -63,10 +63,6 @@ class ProjectEstimateLists extends BaseAdminDataLists implements ListsSearchInte
     {
 		$params = $this->request->param();
 		$where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
 	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
 		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
@@ -124,10 +120,6 @@ class ProjectEstimateLists extends BaseAdminDataLists implements ListsSearchInte
     {
 	    $params = $this->request->param();
 	    $where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
 	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
 		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
diff --git a/app/adminapi/lists/project/ProjectFollowUpLists.php b/app/adminapi/lists/project/ProjectFollowUpLists.php
index 05fba3ef1..b9a828c58 100644
--- a/app/adminapi/lists/project/ProjectFollowUpLists.php
+++ b/app/adminapi/lists/project/ProjectFollowUpLists.php
@@ -61,10 +61,6 @@ class ProjectFollowUpLists extends BaseAdminDataLists implements ListsSearchInte
     {
 		$params = $this->request->param();
 		$where = [];
-		if(isset($params['project_name']) && $params['project_name'] != ''){
-			$projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-			$where[] = ['project_id','in',$projectIds];
-		}
 		if(isset($params['custom_name']) && $params['custom_name'] != ''){
 			$customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 			$projectIds = Project::where('custom_id','in',$customIds)->column('id');
@@ -99,10 +95,6 @@ class ProjectFollowUpLists extends BaseAdminDataLists implements ListsSearchInte
     {
 	    $params = $this->request->param();
 	    $where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
 	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
 		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
 		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
diff --git a/app/adminapi/lists/project/ProjectLists.php b/app/adminapi/lists/project/ProjectLists.php
index fb9a5540f..8cb855350 100644
--- a/app/adminapi/lists/project/ProjectLists.php
+++ b/app/adminapi/lists/project/ProjectLists.php
@@ -60,13 +60,7 @@ class ProjectLists extends BaseAdminDataLists implements ListsSearchInterface,Li
      */
     public function lists(): array
     {
-		$params = $this->request->param();
-		$condition = [];
-		if(isset($params['custom_name']) && $params['custom_name'] != ''){
-			$customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
-			$condition[] = ['custom_id','in',$customIds];
-		}
-        return Project::where($this->searchWhere)->where($condition)
+        return Project::where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){
@@ -105,13 +99,7 @@ class ProjectLists extends BaseAdminDataLists implements ListsSearchInterface,Li
      */
     public function count(): int
     {
-	    $params = $this->request->param();
-	    $condition = [];
-	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
-		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
-		    $condition[] = ['custom_id','in',$customIds];
-	    }
-        return Project::where($this->searchWhere)->where($condition)->count();
+        return Project::where($this->searchWhere)->count();
     }
 	
 	public function setFileName(): string
diff --git a/app/adminapi/lists/project/ProjectPreSalesMembersLists.php b/app/adminapi/lists/project/ProjectPreSalesMembersLists.php
index d153ddc2e..6f2f792bf 100644
--- a/app/adminapi/lists/project/ProjectPreSalesMembersLists.php
+++ b/app/adminapi/lists/project/ProjectPreSalesMembersLists.php
@@ -42,7 +42,7 @@ class ProjectPreSalesMembersLists extends BaseAdminDataLists implements ListsSea
     public function setSearch(): array
     {
         return [
-            '=' => ['project_id', 'technician_ids', 'business_people_ids', 'cross_departmental_personnel_ids'],
+            '=' => ['project_id'],
         ];
     }
 
@@ -58,18 +58,7 @@ class ProjectPreSalesMembersLists extends BaseAdminDataLists implements ListsSea
      */
     public function lists(): array
     {
-		$params = $this->request->param();
-		$where = [];
-		if(isset($params['project_name']) && $params['project_name'] != ''){
-			$projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-			$where[] = ['project_id','in',$projectIds];
-		}
-		if(isset($params['custom_name']) && $params['custom_name'] != ''){
-			$customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
-			$projectIds = Project::where('custom_id','in',$customIds)->column('id');
-			$where[] = ['project_id','in',$projectIds];
-		}
-        return ProjectPreSalesMembers::where($this->searchWhere)->where($where)
+        return ProjectPreSalesMembers::where($this->searchWhere)
             ->field(['id,project_id,technician_ids,business_people_ids,cross_departmental_personnel_ids,add_user,create_time'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
@@ -100,18 +89,7 @@ class ProjectPreSalesMembersLists extends BaseAdminDataLists implements ListsSea
      */
     public function count(): int
     {
-	    $params = $this->request->param();
-	    $where = [];
-	    if(isset($params['project_name']) && $params['project_name'] != ''){
-		    $projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
-	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
-		    $customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
-		    $projectIds = Project::where('custom_id','in',$customIds)->column('id');
-		    $where[] = ['project_id','in',$projectIds];
-	    }
-        return ProjectPreSalesMembers::where($this->searchWhere)->where($where)->count();
+        return ProjectPreSalesMembers::where($this->searchWhere)->count();
     }
 	
 	public function setFileName(): string