gx

@@ -57,9 +57,6 @@ class BaseController extends Controller
             if(is_array($v)){
             if(is_array($v)){
                 $this->map[$k] = $v;
                 $this->map[$k] = $v;
             }else{
             }else{
-                if(empty($v) && ($v == null)){
-                    unset($this->param[$k]);
-                }
                 $this->getMap($k,$v);
                 $this->getMap($k,$v);
             }
             }
         }
         }

@@ -87,7 +87,7 @@ class ProjectController extends BaseController
         //按类型搜索
         //按类型搜索
         $query = $this->searchContent($query);
         $query = $this->searchContent($query);
         //搜索升级项目
         //搜索升级项目
-//        $query = $this->searchUpgrade($query);
+        $query = $this->searchUpgrade($query);
         return $query;
         return $query;
     }
     }
 
 
@@ -97,13 +97,13 @@ class ProjectController extends BaseController
      * @return mixed
      * @return mixed
      */
      */
     public function searchType(&$query){
     public function searchType(&$query){
-//        if(isset($this->map['type']) && !empty($this->map['type'])){
+        if(isset($this->map['type'])){
             if (in_array($this->map['type'], [Project::TYPE_ZERO, Project::TYPE_ONE, Project::TYPE_TWO, Project::TYPE_THREE]))
             if (in_array($this->map['type'], [Project::TYPE_ZERO, Project::TYPE_ONE, Project::TYPE_TWO, Project::TYPE_THREE]))
                 $query->where('gl_project.type', $this->map['type']);
                 $query->where('gl_project.type', $this->map['type']);
             else{
             else{
                 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
                 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
             }
             }
-//        }
+        }
         return $query;
         return $query;
     }
     }