diff --git a/module/stage/model.php b/module/stage/model.php index 267ef471be..6f96ca06a6 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -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; }