Merge branch 'fixbug' into 'master'

* Fix bug #18209.

See merge request easycorp/zentaopms!3111
This commit is contained in:
王怡栋
2022-04-25 09:24:23 +00:00
3 changed files with 5 additions and 2 deletions
+1
View File
@@ -39,3 +39,4 @@ $lang->stage->confirmDelete = 'Do you want to delete it?';
$lang->stage->error = new stdclass();
$lang->stage->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.';
$lang->stage->error->notNum = 'The workload ratio should be numerical';
+3 -2
View File
@@ -37,5 +37,6 @@ $lang->stage->viewList = '浏览列表';
$lang->stage->noStage = '暂时没有阶段';
$lang->stage->confirmDelete = '您确定要执行删除操作吗?';
$lang->stage->error = new stdclass();
$lang->stage->error->percentOver = '工作量占比累计不应当超过100%';
$lang->stage->error = new stdclass();
$lang->stage->error->percentOver = '工作量占比累计不应当超过100%';
$lang->stage->error->notNum = '工作量占比应当是数字';
+1
View File
@@ -28,6 +28,7 @@ class stageModel extends model
$totalPercent = $this->getTotalPercent();
if(!is_numeric($stage->percent)) return dao::$errors['message'][] = $this->lang->stage->error->notNum;
if(round($totalPercent + $stage->percent) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
$this->dao->insert(TABLE_STAGE)