* Fix syntax error.

This commit is contained in:
wangyidong
2023-06-10 16:22:30 +08:00
parent 2d8eb23f8d
commit 6a32463f7f
3 changed files with 14 additions and 15 deletions
+8 -9
View File
@@ -682,22 +682,21 @@ class productTao extends productModel
* 获取项目关联的产品。
* Get products by project ID.
*
* @param int $projectID
* @param string $append '1,2,3'
* @param string $status
* @param string $orderBy
* @param bool $noDeleted
* @param int $projectID
* @param string|array $append '1,2,3'
* @param string $status
* @param string $orderBy
* @param bool $noDeleted
* @access protected
* @return int[]
*/
protected function getProductsByProjectID(int $projectID, string $append, string $status, string $orderBy, bool $noDeleted = true): array
protected function getProductsByProjectID(int $projectID, string|array $append, string $status, string $orderBy, bool $noDeleted = true): array
{
/* 处理要用的到变量信息。 */
$append = $this->formatAppendParam($append);
$orderBy = ($orderBy ? "{$orderBy}," : '') . 't2.order asc';
return $this->dao->select("t1.branch, t1.plan, t2.*")
->from(TABLE_PROJECTPRODUCT)->alias('t1')
return $this->dao->select("t1.branch, t1.plan, t2.*")->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
->where('(1=1')
->beginIF($noDeleted)->andWhere('t2.deleted')->eq(0)->fi()
@@ -706,7 +705,7 @@ class productTao extends productModel
->andWhere('t2.vision')->eq($this->config->vision)
->beginIF(strpos($status, 'noclosed') !== false)->andWhere('t2.status')->ne('closed')->fi()
->markRight(1)
->beginIF($append)->orWhere('t1.id')->in($append)->fi()
->beginIF($append)->orWhere('t2.id')->in($append)->fi()
->orderBy($orderBy)
->fetchAll();
}
+1 -1
View File
@@ -193,7 +193,7 @@ class project extends control
* @access public
* @return string
*/
public function ajaxGetLinkedProducts(string $projectID): string
public function ajaxGetLinkedProducts(string $projectID)
{
$productsWithBranch = array();
$linkedProducts = $this->project->getBranchesByProject((int)$projectID);
+5 -5
View File
@@ -900,15 +900,15 @@ class projectZen extends project
* 获取其他的关联产品
* Get other products under the projectprogram.
*
* @param object $programProducts
* @param array $branchGroups
* @param array $linkedBranches
* @param array $linkedProducts
* @param array $programProducts
* @param array $branchGroups
* @param array $linkedBranches
* @param array $linkedProducts
*
* @access protected
* @return array
*/
protected function getOtherProducts(object $programProducts, array $branchGroups, array $linkedBranches, array $linkedProducts): array
protected function getOtherProducts(array $programProducts, array $branchGroups, array $linkedBranches, array $linkedProducts): array
{
foreach($programProducts as $productID => $productName)
{