Merge branch 'bug_21982' into 'master'

Fix bug#21982,21983,21981

See merge request easycorp/zentaopms!3122
This commit is contained in:
李玉春
2022-04-26 08:09:06 +00:00
6 changed files with 8 additions and 3 deletions
+1
View File
@@ -79,3 +79,4 @@ $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begi
$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.';
$lang->programplan->error->createdTask = 'The task is decomposed. Sub stages cannot be added.';
$lang->programplan->error->parentWorkload = 'The sum of the workload in the sub stage cannot be > that in the parent stage: %s.';
$lang->programplan->error->sameName = 'Stage name cannot be the same!';
+1
View File
@@ -80,3 +80,4 @@ $lang->programplan->error->percentOver = '工作量占比累计不应当超
$lang->programplan->error->createdTask = '已分解任务,不可添加子阶段';
$lang->programplan->error->parentWorkload = '子阶段的工作量之和不能大于父阶段的工作量:%s';
$lang->programplan->error->parentDuration = '子阶段计划开始、计划完成不能超过父阶段';
$lang->programplan->error->sameName = '阶段名称不能相同!';
+3
View File
@@ -433,6 +433,9 @@ class programplanModel extends model
$parentACL = $parentStage->acl;
}
$names = array_filter($names);
if(count(array_unique($names)) != count($names)) return dao::$errors['message'][] = $this->lang->programplan->error->sameName;
$datas = array();
foreach($names as $key => $name)
{