From c649903b8cedac542dc999a8b9c96aae4502dec4 Mon Sep 17 00:00:00 2001
From: z <wyd621@163.com>
Date: Fri, 27 Nov 2020 15:58:07 +0800
Subject: [PATCH]  * fix bug for search in build.

---
 module/build/model.php     | 16 +++++++++++++---
 module/project/control.php |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/module/build/model.php b/module/build/model.php
index 2dd98900c6..6d8b9c332b 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -84,15 +84,25 @@ class buildModel extends model
     public function getProjectBuildsBySearch($projectID, $queryID)
     {
         /* If there are saved query conditions, reset the session. */
-        if($queryID)
+        if((int)$queryID)
         {
-            $query = $this->loadModel('search')->getQuery($queryID);
-            if($query)
+            $buildQuery = $this->loadModel('search')->getQuery($queryID);
+            if($buildQuery)
             {
                 $this->session->set('projectBuildQuery', $query->sql);
                 $this->session->set('projectBuildForm', $query->form);
             }
+            else
+            {
+                $this->session->set('projectBuildQuery', ' 1 = 1');
+            }
         }
+        else
+        {
+            if($this->session->projectBuildQuery == false) $this->session->set('projectBuildQuery', ' 1 = 1');
+        }
+
+        $buildQuery = $this->session->projectBuildQuery;
 
         /* Distinguish between repeated fields. */
         $fields = array('id' => '`id`', 'name' => '`name`', 'product' => '`product`', 'desc' => '`desc`');
diff --git a/module/project/control.php b/module/project/control.php
index 6c406fa7ae..66885dd5f0 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -885,7 +885,7 @@ class project extends control
         /* Get builds. */
         if($type == 'bysearch')
         {
-            $builds = $this->loadModel('build')->getProjectBuildsBySearch((int)$projectID, $param);
+            $builds = $this->loadModel('build')->getProjectBuildsBySearch((int)$projectID, (int)$param);
         }
         else
         {