From 0aa36bd6e5ab9c5e4a3a5fa7c2cfa0635e1970ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 11 May 2022 16:25:43 +0800
Subject: [PATCH] *Optimize the code.

---
 module/project/config.php                 | 2 +-
 module/project/lang/zh-cn.php             | 2 +-
 module/project/model.php                  | 3 +--
 module/project/view/browsebylist.html.php | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/project/config.php b/module/project/config.php
index 9c8be57d6b..9fb9286c56 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -136,7 +136,7 @@ $config->project->search['module']                   = 'project';
 $config->project->search['fields']['name']           = $lang->project->name;
 $config->project->search['fields']['code']           = $lang->project->code;
 $config->project->search['fields']['id']             = $lang->project->id;
-$config->project->search['fields']['model']          = $lang->project->manageType;
+$config->project->search['fields']['model']          = $lang->project->model;
 $config->project->search['fields']['parent']         = $lang->project->parent;
 $config->project->search['fields']['status']         = $lang->project->projectStatus;
 $config->project->search['fields']['desc']           = $lang->project->desc;
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index ba4ec95a1f..b60f1e6366 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -66,7 +66,6 @@ $lang->project->id                 = '项目编号';
 $lang->project->project            = '所属项目';
 $lang->project->stage              = '阶段';
 $lang->project->model              = '项目管理方式';
-$lang->project->manageType         = '管理类型';
 $lang->project->PM                 = '负责人';
 $lang->project->PO                 = '项目负责人';
 $lang->project->QD                 = '测试负责人';
@@ -163,6 +162,7 @@ $lang->project->branch             = '所属分支';
 $lang->project->plan               = '所属计划';
 $lang->project->createKanban       = '添加看板';
 $lang->project->kanban             = '看板';
+$lang->project->search             = '搜索';
 
 /* Project Kanban. */
 $lang->project->typeList = array();
diff --git a/module/project/model.php b/module/project/model.php
index 6cfcc799d9..458bac3853 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -637,10 +637,9 @@ class projectModel extends model
      * */
     public function getBySearch($projectQuery)
     {
-        $flag = stripos($projectQuery, 'and') + 3;
-        $projectQuery = substr_replace($projectQuery, " (`type` = 'project') and", $flag, 0);
         $projects = $this->dao->select('*')->from(TABLE_PROJECT)
             ->where($projectQuery)
+            ->andWhere('type')->eq('project')
             ->fetchAll();
         return $projects;
     }
diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php
index df3626ef01..052a85fe84 100644
--- a/module/project/view/browsebylist.html.php
+++ b/module/project/view/browsebylist.html.php
@@ -40,7 +40,7 @@
     <?php echo html::a(inlink('browse', "programID=$programID&browseType=$key"), $label, '', "class='btn btn-link $active'");?>
     <?php endforeach;?>
     <?php echo html::checkbox('involved', array('1' => $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?>
-    <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo '搜索';?></a>
+    <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->project->search;?></a>
   </div>
   <div class="btn-toolbar pull-right">
     <div class="btn-group panel-actions">