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

modify code format

Browse Source
This commit is contained in:
Zongjun Lan
2022-02-23 11:27:10 +08:00
parent f6b9ade20a
commit 91f09fe484
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+16 -9
View File
@@ -2120,17 +2120,21 @@ class taskModel extends model
$parents = $this->dao->select('*')->from(TABLE_TASK)->where('id')->in($parents)->fetchAll('id');
$lanes = array();
$cardsWhere = '';
foreach ($tasks as $task) {
if (empty($cardsWhere)) {
foreach($tasks as $task)
{
if(empty($cardsWhere))
{
$cardsWhere = "cards like '%,{$task->id},%'";
} else {
}
else
{
$cardsWhere .= " or cards like '%,{$task->id},%'";
}
}
$lanes = $this->dao->select('t1.lane,t2.name,t1.cards')
->from(TABLE_KANBANCELL)->alias('t1')
->leftJoin(TABLE_KANBANLANE)->alias('t2')->on('t1.lane = t2.id')
->where('t1.kanban')->eq($executionID)->andWhere($cardsWhere, true)->markRight(1)->fetchAll('cards');
->from(TABLE_KANBANCELL)->alias('t1')
->leftJoin(TABLE_KANBANLANE)->alias('t2')->on('t1.lane = t2.id')
->where('t1.kanban')->eq($executionID)->andWhere($cardsWhere, true)->markRight(1)->fetchAll('cards');
foreach($tasks as $task)
{
@@ -2149,9 +2153,12 @@ class taskModel extends model
}
$task->lane = '';
if (!empty($lanes)) {
foreach ($lanes as $lane) {
if (strpos($lane->cards, $task->id) !== false) {
if(!empty($lanes))
{
foreach($lanes as $lane)
{
if(strpos($lane->cards, $task->id) !== false)
{
$task->lane = $lane->name;
}
}