diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 2dfefd6..3309020 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1505,7 +1505,7 @@ and b.cshape=#cshape# and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart > '1900-01-01' and scd.eend > '1900-01-01' - and scd.estart > now() + and date_add(a.cdt, interval +1 year) >= date_format(now(),'%Y-%m-%d 23:59:59')) diff --git a/FO/Views/My/LectureOn.cshtml b/FO/Views/My/LectureOn.cshtml index 6584b60..bbd7a7d 100644 --- a/FO/Views/My/LectureOn.cshtml +++ b/FO/Views/My/LectureOn.cshtml @@ -44,14 +44,7 @@ - @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01") && d.iscomplete != 1 && Convert.ToDateTime(d.estart) > DateTime.Now) - { -
변경
- } - else - { - - - } +
변경
}