* Finish task#8865.

2021-01-01 11:34:11 +08:00
parent de2769bc5f
commit 0c4afee4ee
9 changed files with 103 additions and 15 deletions
@@ -260,10 +260,11 @@ class riskModel extends model
     * @param  string $account
     * @param  int    $limit
     * @param  string $status all|active|closed|hangup|canceled
+     * @param  array  $skipProjectIDList
     * @access public
     * @return array
     */
-    public function getUserRiskPairs($account, $limit = 0, $status = 'all')
+    public function getUserRiskPairs($account, $limit = 0, $status = 'all', $skipProjectIDList = array())
    {
        $stmt = $this->dao->select('t1.id, t1.name, t2.name as project')
            ->from(TABLE_RISK)->alias('t1')
@@ -271,6 +272,7 @@ class riskModel extends model
            ->where('t1.assignedTo')->eq($account)
            ->andWhere('t1.deleted')->eq(0)
            ->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi()
+            ->beginIF(!empty($skipProjectIDList))->andWhere('t1.PRJ')->notin($skipProjectIDList)->fi()
            ->beginIF($limit)->limit($limit)->fi()
            ->query();