Merge branch 'sprint/tianshujie_fixbug' into 'master'

Sprint/tianshujie fixbug See merge request easycorp/zentaopms!3631
2022-05-26 09:10:25 +00:00
parent 3c72f60129 79d7990c21
commit 03d7b05aa8
2 changed files with 2 additions and 1 deletions
@@ -317,7 +317,7 @@ class doc extends control
            if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $docID));
            $objectID = zget($lib, $lib->type, '');
            $params   = "type={$lib->type}&objectID=$objectID&libID={$lib->id}&docID=" . $docResult['id'];
-            $link     = isonlybody() ? 'parent' : $this->createLink('doc', 'objectLibs', $params, 'html');
+            $link     = isonlybody() ? 'parent' : $this->createLink('doc', 'objectLibs', $params, 'html') . '#app=' . $this->app->tab;
            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
        }

@@ -291,6 +291,7 @@ class tutorialModel extends model
        $execution->end           = date('Y-m-d', strtotime('+7 days'));
        $execution->realBegan     = '';
        $execution->realEnd       = '';
+        $execution->suspendedDate = '';
        $execution->days          = 10;
        $execution->status        = 'wait';
        $execution->pri           = '1';