From 7688d211d32cbda2898e41d2deb21f56482f7fe5 Mon Sep 17 00:00:00 2001 From: zenggang Date: Tue, 26 Apr 2022 06:21:15 +0000 Subject: [PATCH] * Fix bug#21981 --- module/programplan/lang/en.php | 1 + module/programplan/lang/zh-cn.php | 1 + module/programplan/model.php | 3 +++ 3 files changed, 5 insertions(+) diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index ddd4931d7f..e9ef5a18f4 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -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!'; diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index c67b97931a..494b212d51 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -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 = '阶段名称不能相同!'; diff --git a/module/programplan/model.php b/module/programplan/model.php index 3fefb2d7c9..3f522166b4 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -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) {