From d7e7d6bef1e21c58c5917d4526a90f13fc0e7be2 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Wed, 30 Jun 2021 04:41:28 +0000
Subject: [PATCH] =?UTF-8?q?=ED=95=99=EC=8A=B5=20=EC=99=84=EB=A3=8C=20?=
 =?UTF-8?q?=ED=9A=8C=EC=B0=A8=20=EC=9D=BC=EC=9D=BC=20=EC=B5=9C=EB=8C=80=20?=
 =?UTF-8?q?=EC=88=98=EB=A3=8C=20=ED=9A=8C=EC=B0=A8=20=EC=A0=9C=ED=95=9C=20?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=95=88=20=ED=83=80=EA=B2=8C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dao/MyBatis/Maps/CRoom.xml       | 3 ++-
 FO/Controllers/CDMSController.cs | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index e702b32..9d0a60c 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -196,7 +196,8 @@
           from lectinning a
           where a.lectno=#lectno#
           <isNotNull property="isfinishtoday">
-            and (a.istatus=2 and a.finishtime is not null and date_format(a.finishtime, '%y%m%d')=date_format(now(), '%y%m%d'))</isNotNull>
+            and (a.istatus=2 and a.finishtime is not null and date_format(a.finishtime, '%y%m%d')=date_format(now(), '%y%m%d'))
+          </isNotNull>
         </select>
         <insert id="cr.lectinningpage.in" parameterClass="lectinningpage">
             update lectinning a
diff --git a/FO/Controllers/CDMSController.cs b/FO/Controllers/CDMSController.cs
index 35b1356..f31d2e2 100644
--- a/FO/Controllers/CDMSController.cs
+++ b/FO/Controllers/CDMSController.cs
@@ -83,9 +83,11 @@ namespace NP.FO.Controllers
                 //출석 인증 시만 보이게 제한 처리 (intval 회차, intval2 출석인증제외 회원, intval3 출석인증제외 강좌)
                 if (data != null && (data.intval == 1 || data.intval2 == 1 || data.intval3 == 1))
                 {
-                    var todayLectinningCount = Dao.Get<LectInning>("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.lectno }, { "isfinishtoday", 1 } }).Count();
+                    var lectInnings = Dao.Get<LectInning>("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.lectno }, { "isfinishtoday", 1 } });
+                    var todayLectinningCount = lectInnings.Count();
+                    var istatus = lectInnings.Where(w => w.cmino == vm.cmino && w.istatus == 2).FirstOrDefault() != null ? 2 : 0;
                     //1일 신규 동영상 강의를 8차시로 제한
-                    if (todayLectinningCount < 8)
+                    if (todayLectinningCount < 8 || istatus == 2)
                     {
                         //이어보기를 위해 페이지관리
                         //vm.pseq = vm.pseq < 1 ? 1 : vm.pseq;