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

* [task#150564] Add the condition of deleted when query decision.

Browse Source
This commit is contained in:
xieqiyu
2025-10-16 02:12:32 +00:00
parent 0ec6fbe98d
commit 53a80ebd1a
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/stage/model.php
+4 -8
View File
@@ -170,7 +170,7 @@ class stageModel extends model
->orderBy($orderBy)
->fetchAll('id');
$stagePoints = $this->dao->select('*')->from(TABLE_DECISION)->where('stage')->in(array_keys($stages))->orderBy('order_asc')->fetchGroup('stage');
$stagePoints = $this->dao->select('*')->from(TABLE_DECISION)->where('stage')->in(array_keys($stages))->andWhere('deleted')->eq('0')->orderBy('order_asc')->fetchGroup('stage');
$pointList = array();
foreach($stagePoints as $stageID => $points)
{
@@ -300,7 +300,8 @@ class stageModel extends model
$stage = $this->dao->select('*')->from(TABLE_STAGE)->where('id')->eq($stageID)->fetch();
return $this->dao->select('t1.*,t2.flow')->from(TABLE_DECISION)->alias('t1')
->leftJoin(TABLE_APPROVALFLOWOBJECT)->alias('t2')->on("t1.id = t2.objectID AND t2.objectType = 'point'")
->where('t1.stage')->eq($stageID)
->where('t1.deleted')->eq('0')
->andWhere('t1.stage')->eq($stageID)
->andWhere('t1.type')->eq($type)
->andWhere('t2.root')->eq($stage->workflowGroup)
->orderBy('order_asc')
@@ -379,12 +380,7 @@ class stageModel extends model
if(!empty($oldStagePoints))
{
$this->dao->delete()->from(TABLE_DECISION)->where('id')->in(array_keys($oldStagePoints))->exec();
$this->dao->delete()->from(TABLE_APPROVALFLOWOBJECT)
->where('objectID')->in(array_keys($oldStagePoints))
->andWhere('objectType')->eq('point')
->andWhere('root')->eq($stage->workflowGroup)
->exec();
$this->dao->update(TABLE_DECISION)->set('deleted')->eq('1')->where('id')->in(array_keys($oldStagePoints))->exec();
}
return true;
}