From 9578e08be3d35593605d9acca35061b6ec88b58a Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 7 Nov 2023 14:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/project/model/ProjectTask.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/project/model/ProjectTask.php b/app/project/model/ProjectTask.php
index f48e23f..11ae21e 100644
--- a/app/project/model/ProjectTask.php
+++ b/app/project/model/ProjectTask.php
@@ -45,6 +45,7 @@ class ProjectTask extends Model
     function list($param) {
         $where = array();
         $whereOr = array();
+        $whereOrKeyword = array();
         $map1 = [];
         $map2 = [];
         $map3 = [];
@@ -77,17 +78,22 @@ class ProjectTask extends Model
             $where[] = ['title|content', 'like', '%' . $param['keywords'] . '%'];
         }
         if (!empty($param['keyword'])) {
-            $where[] = ['title|content', 'like', '%' . $param['keyword'] . '%'];
+            $project_ids = Db::name('Project')->where('name', 'like', '%' . $param['keyword'] . '%')->column('id');
+            $map5[] = ['title', 'like', '%' . $param['keyword'] . '%'];
+            $map6[] = ['project_id', 'in', $project_ids];
+            $whereOrKeyword =[$map5, $map6];
         }
-		
         $where[] = ['delete_time', '=', 0];
-		
         $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
         $list = Db::name('ProjectTask')
 			->where(function ($query) use ($whereOr) {
 				if (!empty($whereOr))
 					$query->whereOr($whereOr);
 				})
+            ->where(function ($query) use ($whereOrKeyword) {
+                if (!empty($whereOrKeyword))
+                    $query->whereOr($whereOrKeyword);
+                })
 			->where($where)
             ->withoutField('content,md_content')
             ->order('flow_status asc')