Merge branch '18.x' into ipd1.1

This commit is contained in:
tanghucheng
2023-09-27 02:08:48 -04:00
834 changed files with 62911 additions and 1005 deletions
+1
View File
@@ -1209,6 +1209,7 @@ class executionModel extends model
->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
$this->loadModel('project')->recordFirstEnd($executionID);
/* When it has multiple errors, only the first one is prompted */
if(dao::isError() and count(dao::$errors['realBegan']) > 1) dao::$errors['realBegan'] = dao::$errors['realBegan'][0];