From a9aab79f65ea0f98a85ddab1a965ae93ce949a6a Mon Sep 17 00:00:00 2001
From: yfl <554665488@qq.com>
Date: Fri, 19 Apr 2019 11:17:29 +0800
Subject: [PATCH] * project team expect feedback

---
 module/project/control.php | 2 +-
 module/user/model.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 878fe02b3b..7d5fa23f71 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1780,7 +1780,7 @@ class project extends control
         $this->loadModel('dept');
 
         $project        = $this->project->getById($projectID);
-        $users          = $this->user->getPairs('noclosed|nodeleted|devfirst');
+        $users          = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback');
         $roles          = $this->user->getUserRoles(array_keys($users));
         $deptUsers      = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept);
         $currentMembers = $this->project->getTeamMembers($projectID);
diff --git a/module/user/model.php b/module/user/model.php
index 8d1c10066f..90c948fe56 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -91,7 +91,7 @@ class userModel extends model
         $users = $this->dao->select($fields)->from(TABLE_USER)
             ->where('1')
             ->beginIF(strpos($params, 'nodeleted') !== false or empty($this->config->user->showDeleted))->andWhere('deleted')->eq('0')->fi()
-            ->andWhere('role')->ne('market')
+            ->beginIF(strpos($params, 'nofeedback') !== false )->andWhere('feedback')->ne('1')->fi()
             ->orderBy($orderBy)
             ->fetchAll('account');
         if($usersToAppended) $users += $this->dao->select($fields)->from(TABLE_USER)->where('account')->in($usersToAppended)->fetchAll('account');