Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/174_tianshujie_45007' into 'master'

Browse Source 
* Modify use case branch query conditions.

See merge request easycorp/zentaopms!667
This commit is contained in:
李玉春
2021-11-30 05:39:08 +00:00
parent c30c1466d0 2a469dc6f7
commit 0ab2f6d249
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/testtask/model.php
View File

@@ -456,7 +456,7 @@ class testtaskModel extends model
->andWhere('t1.product')->eq($productID)
->andWhere('status')->ne('wait')
->beginIF($linkedCases)->andWhere('t1.id')->notIN($linkedCases)->fi()
->beginIF($task->branch)->andWhere('t1.branch')->in("0,$task->branch")->fi()
->beginIF($task->branch !== '')->andWhere('t1.branch')->in("0,$task->branch")->fi()
->andWhere('deleted')->eq(0)
->orderBy('id desc')
->page($pager)