* finish task #2938.

2017-03-01 11:05:25 +08:00
parent 175f0b4160
commit 586ac5c826
10 changed files with 276 additions and 3 deletions
@@ -1896,9 +1896,22 @@ class project extends control
     */
    public function ajaxGetMatchedItems($keywords, $module, $method, $extra)
    {
-        $projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq(0)->andWhere('name')->like("%$keywords%")->orderBy('order desc')->fetchAll();
+        $projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq(0)->orderBy('order desc')->fetchAll();
+        $toPinyin = $this->project->toPinyin($projects);
+
+        foreach($toPinyin as $key => $value) {
+            if(!strstr($value ,$keywords) && !strstr($key,$keywords)) {
+                unset($toPinyin[$key]);
+            }   
+        }   
+
        foreach($projects as $key => $project)
        {
+            if(!isset($toPinyin[$project->name])) {
+                unset($projects[$key]);
+                continue;
+            }
+
            if(!$this->project->checkPriv($project)) unset($projects[$key]);
        }