Merge branch 'sprint/175_zhengrunyu_45150' into 'master'

*Finish task #45150.

See merge request easycorp/zentaopms!698
This commit is contained in:
孙广明
2021-12-01 05:16:22 +00:00
2 changed files with 13 additions and 1 deletions

View File

@@ -1186,6 +1186,9 @@ class projectModel extends model
->where('id')->eq((int)$projectID)
->exec();
/* 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];
if(!dao::isError()) return common::createChanges($oldProject, $project);
}
@@ -1338,6 +1341,9 @@ class projectModel extends model
->where('id')->eq((int)$projectID)
->exec();
/* When it has multiple errors, only the first one is prompted */
if(dao::isError() and count(dao::$errors['realEnd']) > 1) dao::$errors['realEnd'] = dao::$errors['realEnd'][0];
if(!dao::isError())
{
$this->loadModel('score')->create('project', 'close', $oldProject);