From d3e63841faf30af2d23855b5b27a7311fb6d63db Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 25 Mar 2022 15:00:30 +0800
Subject: [PATCH] * Fix bug #20559.

---
 module/personnel/model.php          | 4 ++--
 module/project/css/create.css       | 1 +
 module/project/view/create.html.php | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/personnel/model.php b/module/personnel/model.php
index f6746fc6a0..80da5f7ff5 100644
--- a/module/personnel/model.php
+++ b/module/personnel/model.php
@@ -38,12 +38,12 @@ class personnelModel extends model
         }
 
         /* Determine who can be accessed based on access control. */
-        $program = $this->loadModel('program')->getByID($programID);
+        $program       = $this->loadModel('program')->getByID($programID);
         $personnelList = array();
         $personnelList = $this->dao->select('t2.id,t2.dept,t2.account,t2.role,t2.realname,t2.gender')->from(TABLE_USERVIEW)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account=t2.account')
             ->where('t2.deleted')->eq(0)
-            ->beginIF($program->acl != 'open')->andWhere("CONCAT(',', t1.programs, ',')")->like("%,$programID,%")
+            ->beginIF($program->acl != 'open')->andWhere("CONCAT(',', t1.programs, ',')")->like("%,$programID,%")->fi()
             ->beginIF($deptID > 0)->andWhere('t2.dept')->eq($deptID)->fi()
             ->beginIF($browseType == 'bysearch')->andWhere($accessibleQuery)->fi()
             ->fetchAll('id');
diff --git a/module/project/css/create.css b/module/project/css/create.css
index 29f7111b19..92825f4fa9 100644
--- a/module/project/css/create.css
+++ b/module/project/css/create.css
@@ -12,3 +12,4 @@
 #budget {border-right: 0px;}
 #budgetUnit {border-left: 0px;}
 #projectName {display: inline-block; width: 32%;}
+#productsBox a {border-radius: 2px !important;}
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index e9a9753a2d..bae762bbb3 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -119,7 +119,9 @@
               <div class='col-sm-4 <?php if($programID) echo 'required';?>' style="padding-right: 6px;">
                 <div class='input-group'>
                   <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
+                  <?php if(common::hasPriv('product', 'create')):?>
                   <span class='input-group-addon'><?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?></span>
+                  <?php endif;?>
                 </div>
               </div>
             </div>