diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index 1328e09..1eba483 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -162,7 +162,7 @@ ,a2.isseq,a2.sstime,a2.setime ,b.cmino,b.iseq,b.isonline,b.ititle,b.sttime,b.idate,b.ist,b.iet,b.icontent ,cp.istatus preistatus - ,c.totstudy,c.istatus,c.stime + ,c.totstudy,c.istatus,c.stime, c.lectno existslectinning ,case when b.isonline=1 then d.tfurl else null end tfurl ,case when b.isonline=1 then df.fileurl else df3.fileurl end fileurl ,case when b.isonline=1 then df.fileno else df3.fileno end fileno @@ -185,9 +185,11 @@ limit $limit$ update lectinning a diff --git a/FO/Controllers/CRoomController.cs b/FO/Controllers/CRoomController.cs index 9b149e8..d530019 100644 --- a/FO/Controllers/CRoomController.cs +++ b/FO/Controllers/CRoomController.cs @@ -36,7 +36,7 @@ namespace NP.FO.Controllers } vm.Datas = Dao.Get("cr.main.boardalarm", new System.Collections.Hashtable() { { "bmnos", bmnos != null ? bmnos.Substring(1) : bmnos},{ "lect", vm.croomlectno },{ "cmno", vm.croomcmno }, { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } }); vm.LectInnings = Dao.Get("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno },{ "userno",SUserInfo.UserNo}, { "notstudy"+(Request.IsLocal?"x":""), 1 },{ "limit", 6} }); - if (vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1) + if (!string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1) { vm.intval = Dao.Get("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count(); } diff --git a/Model/CM.cs b/Model/CM.cs index 283b6b3..14db191 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -2864,7 +2864,10 @@ namespace NP.Model public int preistatus { get; set; } public Int64 precmino { get; set; } public String tfurl { get; set; } - + /// + /// lect회차 존재여부 + /// + public String existslectinning { get; set; } } [Serializable]