Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

2021-05-06 15:51:14 +08:00
parent 931b4e51bd 8a1ab47e0a
commit 9bd7e77547
1 changed files with 9 additions and 4 deletions
@@ -1909,18 +1909,23 @@ class story extends control
                        unset($stories[$story->id]);
                    }
                }
+
                if(!empty($children))
                {
-                    $position = 0;
+                    $reorderStory = array();
                    foreach($stories as $story)
                    {
-                        $position ++;
+                        $reorderStory[$story->id] = $story;
                        if(isset($children[$story->id]))
                        {
-                            array_splice($stories, $position, 0, $children[$story->id]);
-                            $position += count($children[$story->id]);
+                            foreach($children[$story->id] as $childrenID => $childrenStory)
+                            {
+                                $reorderStory[$childrenID] = $childrenStory;
+                            }
                        }
+                        unset($stories[$story->id]);
                    }
+                    $stories = $reorderStory;
                }
            }