From e11b76d8196b0d0aedceb2a82ad4e4d11d16a7bc Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Fri, 10 Jun 2022 10:23:27 +0800
Subject: [PATCH] * Ajust mutual test issue.

---
 module/my/model.php      | 14 +++++++++++---
 module/project/model.php |  1 -
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/module/my/model.php b/module/my/model.php
index cc5a46398f..91b9784adf 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -634,7 +634,14 @@ class myModel extends model
      */
     public function buildRiskSearchForm($queryID, $actionURL, $type)
     {
-        $projects  = $this->loadModel('project')->getPairsByProgram();
+        $projects  = $this->dao->select('id, name')->from(TABLE_PROJECT)
+            ->where('type')->eq('project')
+            ->andWhere('deleted')->eq('0')
+            ->andWhere('vision')->eq($this->config->vision)
+            ->andWhere('model')->ne('kanban')
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
+            ->orderBy('order_asc')
+            ->fetchPairs();
         $queryName = $type == 'contribute' ? 'contributeRisk' : 'workRisk';
 
         $this->app->loadConfig('risk');
@@ -642,7 +649,7 @@ class myModel extends model
         $this->config->risk->search['actionURL']         = $actionURL;
         $this->config->risk->search['queryID']           = $queryID;
 
-        $this->config->risk->search['params']['project']['value'] = array('') + $projects;
+        $this->config->risk->search['params']['project']['values'] = array('') + $projects;
 
         if($this->config->systemMode == 'classic') unset($this->config->risk->search['fields']['project']);
         unset($this->config->risk->search['fields']['module']);
@@ -690,9 +697,10 @@ class myModel extends model
             $risks = $this->dao->select('*')->from(TABLE_RISK)
                 ->where($riskQuery)
                 ->andWhere('deleted')->eq('0')
-                ->orWhere('createdBy',1)->eq($this->app->user->account)
+                ->andWhere('createdBy',1)->eq($this->app->user->account)
                 ->orWhere('id')->in(array_keys($assignedByMe))
                 ->orWhere('closedBy')->eq($this->app->user->account)
+                ->markRight(1)
                 ->orderBy($orderBy)
                 ->page($pager)
                 ->fetchAll('id');
diff --git a/module/project/model.php b/module/project/model.php
index 70d521562f..ef7a0fedec 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -919,7 +919,6 @@ class projectModel extends model
         $projects = $this->dao->select('id, name, path')->from(TABLE_PROJECT)
             ->where('type')->eq('project')
             ->andWhere('deleted')->eq('0')
-            ->andWhere('vision')->eq($this->config->vision)
             ->beginIF($programID)->andWhere('parent')->eq($programID)->fi()
             ->beginIF($this->config->vision)->andWhere('vision')->eq($this->config->vision)->fi()
             ->beginIF($model != 'all')->andWhere('model')->eq($model)->fi()