* adjust code.

2020-01-02 10:00:17 +08:00
parent 7af8e82c0d
commit 3dabfc1b45
12 changed files with 178 additions and 102 deletions
@@ -660,92 +660,4 @@ class blockModel extends model

        return $key == $hash;
    }
-
-    /**
-     * Get products like drop menu order
-     * 
-     * @param  strint    $status 
-     * @param  int       $num 
-     * @access public
-     * @return array
-     */
-    public function getProducts($status, $num)
-    {
-        $products = $this->loadModel('product')->getList($status);
-        if(empty($products)) return $products;
-
-        $lines = $this->loadModel('tree')->getLinePairs($useShort = true);
-        $productList = array();
-        foreach($lines as $id => $name)
-        {
-            foreach($products as $key => $product)
-            {
-                if($product->line == $id)
-                {
-                    $product->name = $name . '/' . $product->name;
-                    $productList[] = $product;
-                    unset($products[$key]);
-                }
-            }
-        }
-        $productList = array_merge($productList, $products);
-
-        $products = $mineProducts = $otherProducts = $closedProducts = array();
-        foreach($productList as $product)
-        {
-            if(!$this->app->user->admin and !$this->product->checkPriv($product->id)) continue;
-            if($product->status == 'normal' and $product->PO == $this->app->user->account) 
-            {
-                $mineProducts[$product->id] = $product;
-            }
-            elseif($product->status == 'normal' and $product->PO != $this->app->user->account) 
-            {
-                $otherProducts[$product->id] = $product;
-            }
-            elseif($product->status == 'closed')
-            {
-                $closedProducts[$product->id] = $product;
-            }
-        }
-        $products = $mineProducts + $otherProducts + $closedProducts;
-
-        if(empty($num)) return $products;
-        return array_slice($products, 0, $num, true);
-    }
-
-    /**
-     * Get projects like drop menu order
-     * 
-     * @param  string    $status 
-     * @param  int       $num 
-     * @access public
-     * @return array
-     */
-    public function getProjects($status, $num)
-    {
-        $projectList = $this->loadModel('project')->getList($status);
-        if(empty($projectList)) return $projectList;
-
-        $projects = $mineProjects = $otherProjects = $closedProjects = array();
-        foreach($projectList as $project)
-        {
-            if(!$this->app->user->admin and !$this->project->checkPriv($project->id)) continue;
-            if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account)
-            {
-                $mineProjects[$project->id] = $project;
-            }
-            elseif($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account))
-            {
-                $otherProjects[$project->id] = $project;
-            }
-            elseif($project->status == 'done' or $project->status == 'closed')
-            {
-                $closedProjects[$project->id] = $project;
-            }
-        }
-        $projects = $mineProjects + $otherProjects + $closedProjects;
-
-        if(empty($num)) return $projects;
-        return array_slice($projects, 0, $num, true);
-    }
 }