Merge branch 'sprint/hufangzhou_task_84583' into 'master'

* Sort the IDs, the child stage comes first, and the parent stage follows.

See merge request easycorp/zentaopms!6996

module/execution/control.php

@@ -2222,8 +2222,6 @@ class execution extends control
     {
         $executionIdList = $this->post->executionIDList;
         if(is_string($executionIdList)) $executionIdList = explode(',', $executionIdList);
-        /* Sub-phases are changed first and then parented. */
-        rsort($executionIdList);
 
         $pointOutStages = $this->execution->batchChangeStatus($executionIdList, $status);
         $project        = $this->loadModel('project')->getById($projectID);

module/execution/model.php

@@ -985,6 +985,9 @@ class executionModel extends model
         $this->loadModel('programplan');
         $this->loadModel('action');
 
+        /* Sort the IDs, the child stage comes first, and the parent stage follows. */
+        $executionIdList = $this->dao->select('id')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->orderBy('grade_desc')->fetchPairs();
+
         $pointOutStages = '';
         foreach($executionIdList as $executionID)
         {