diff --git a/module/program/js/common.js b/module/program/js/common.js index 64ea25edc4..fcaaba2189 100644 --- a/module/program/js/common.js +++ b/module/program/js/common.js @@ -410,11 +410,11 @@ function outOfDateTip() return; } - if(programBegin < parentBegin && programEnd <= parentEnd) + if(programBegin < parentBegin && programEnd <= parentEnd && programEnd >= parentBegin) { dateTip = "" + beginLetterParent + data.selectedProgramBegin + ""; } - else if(programBegin >= parentBegin && programEnd > parentEnd) + else if(programEnd > parentEnd && programBegin >= parentBegin && programBegin <= parentEnd) { dateTip = "" + endGreaterParent + data.selectedProgramEnd + ""; } diff --git a/module/project/js/common.js b/module/project/js/common.js index c163c3bb2d..516b3b23bb 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -388,11 +388,11 @@ function outOfDateTip() if(projectBegin >= parentBegin && projectEnd <= parentEnd) return; var dateTip = ""; - if(projectBegin < parentBegin && projectEnd <= parentEnd) + if(projectBegin < parentBegin && projectEnd <= parentEnd && projectEnd >= parentBegin) { dateTip = "" + beginLetterParent + data.selectedProgramBegin + ""; } - else if(projectBegin >= parentBegin && projectEnd > parentEnd) + else if(projectEnd > parentEnd && projectBegin >= parentBegin && projectBegin <= parentEnd) { dateTip = "" + endGreaterParent + data.selectedProgramEnd + ""; }