diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 0d04352..8cea2f1 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -627,13 +627,14 @@ namespace NP.BO.Controllers
 
                         if (searchCheck)
                         {
-                            if (SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163)
+                            if (true) // SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163 
                             {
                                 vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } });
                                 //vm.Lects = Dao.Get<Lect>("grade.lectgrades", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } });
                             }
                             else
                             {
+                                // 사용안함
                                 vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll2", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } });
                             }
                             
@@ -747,6 +748,17 @@ namespace NP.BO.Controllers
             ht.Add("edateall", vm.stringval9);
             ht.Add("asname", vm.stringval10);
             ht.Add("mobile", vm.stringval11);
+            ht.Add("attendance", vm.stringval13);
+            /*
+             * Dictionary<int, string> attendance = new Dictionary<int, string>() <= stringval13
+                                {
+                                    { 0, "전체"}
+                                    , { 1, "해당없음"}
+                                    , { 2, "대상자(미입력/출석)"}
+                                    , { 3, "미입력"}
+                                    , { 4, "출석"}
+                                };
+             */
             if (!string.IsNullOrEmpty(vm.stringval11))
             {
                 var mobile_temp = vm.stringval11.Replace("-", "");
@@ -793,7 +805,7 @@ namespace NP.BO.Controllers
 
                         //ht.Add("ustatus", 1);
                         ht.Add("orderby", "ua.asname,ua.asno,u.username");
-                        if (SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163) 
+                        if (true) // SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163 
                         {
                             vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll", ht);
 
@@ -818,6 +830,7 @@ namespace NP.BO.Controllers
                         }
                         else
                         {
+                            //사용안함
                             vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll2", ht);
 
                             if (vm.isexceldown == 1)
@@ -909,6 +922,7 @@ namespace NP.BO.Controllers
             if (!IsPost())
             {
                 vm.pagerowcount = 50;
+                vm.stringval4 = "1";
                 //vm.stringval = DateTime.Now.ToString("yyyy-MM-01");
                 //vm.stringval2 = Convert.ToDateTime(vm.stringval).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
             }
diff --git a/BO/Views/croom/gradeall.cshtml b/BO/Views/croom/gradeall.cshtml
index afd3d3c..e9b042c 100644
--- a/BO/Views/croom/gradeall.cshtml
+++ b/BO/Views/croom/gradeall.cshtml
@@ -79,6 +79,28 @@
                                 @Html.Partial("./Partial/Text", Model.stringval11, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval11", Style = "width:70%; display:inline-block;", Value = Model.stringval11, CssClass = "esitem" }))
                             </div>
                         </td>
+                        <th>집합교육</th>
+                        <td>
+                            @{ 
+                                Dictionary<int, string> attendance = new Dictionary<int, string>()
+                                {
+                                    { 0, "전체"}
+                                    , { 1, "해당없음"}
+                                    , { 2, "대상자(미입력/출석/결석)"}
+                                    , { 3, "미입력"}
+                                    , { 4, "출석"}
+                                    , { 5, "결석"}
+                                };
+                            }
+                            <div class="col-md-12">
+                                <select id="stringval13" name="stringval13" class="form-control dev ">
+                                    @foreach (var item in attendance)
+                                    {
+                                        <option value="@item.Key" @(Model.stringval13 == item.Key.ToString() ? "selected" : "")>@item.Value</option>
+                                    }
+                                </select>
+                            </div>
+                        </td>
                     </tr>
             </table>
         </div>
diff --git a/BO/Web.config b/BO/Web.config
index 9b979cd..4eec37f 100644
--- a/BO/Web.config
+++ b/BO/Web.config
@@ -55,8 +55,8 @@
 		<!--<add key="talk" value="https://alimtalk-api.bizmsg.kr/v2/sender/send,?,?,?,?,?,023103312" />-->
 
 		<!--<add key="configpath" value="Product" />-->
-		<add key="configpath" value="ProductDev" />
-		<!--<add key="configpath" value="staging" />-->
+		<!--<add key="configpath" value="ProductDev" />-->
+		<add key="configpath" value="staging" />
 
 
 		<add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />
diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index 618d741..6d47078 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -1327,6 +1327,19 @@
           <isNotNull property="asname" prepend="and">ua.asname like concat('%',#asname#,'%')</isNotNull>
           <isNotNull property="edate" prepend="and">date_format((case when c.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
           <isNotNull property="mobile" prepend="and">cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotNull>
+
+          <isNotNull property="attendance" >
+            <!--해당없음-->
+            <isEqual property="attendance" compareValue="1" prepend="and"> ifnull(d.isoffabs,0) = 0</isEqual>
+            <!--대상자(미입력/출석)-->
+            <isEqual property="attendance" compareValue="2" prepend="and"> ifnull(d.isoffabs,0) = 1</isEqual>
+            <!--미입력-->
+            <isEqual property="attendance" compareValue="3" prepend="and"> ifnull(d.isoffabs,0) = 1 and f.istatus is null </isEqual>
+            <!--출석-->
+            <isEqual property="attendance" compareValue="4" prepend="and"> ifnull(d.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 2</isEqual>
+            <!--결석-->
+            <isEqual property="attendance" compareValue="5" prepend="and"> ifnull(d.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 0</isEqual>
+          </isNotNull>
         </dynamic>
         ) a
         <include refid="sql.pagedynamic"></include>
@@ -1620,6 +1633,19 @@
           <isNotNull property="asname" prepend="and">a.asname like concat('%',#asname#,'%')</isNotNull>
           <isNotNull property="edate" prepend="and">date_format((case when a.cshape = 2 and a.eend is not null then a.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
           <isNotNull property="mobile" prepend="and">a.mobile like concat('%',#mobile#,'%')</isNotNull>
+
+          <isNotNull property="attendance" >
+            <!--해당없음-->
+            <isEqual property="attendance" compareValue="1" prepend="and"> ifnull(a.isoffabs,0) = 0</isEqual>
+            <!--대상자(미입력/출석)-->
+            <isEqual property="attendance" compareValue="2" prepend="and"> ifnull(a.isoffabs,0) = 1</isEqual>
+            <!--미입력-->
+            <isEqual property="attendance" compareValue="3" prepend="and"> ifnull(a.isoffabs,0) = 1 and f.istatus is null </isEqual>
+            <!--출석-->
+            <isEqual property="attendance" compareValue="4" prepend="and"> ifnull(a.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 2</isEqual>
+            <!--결석-->
+            <isEqual property="attendance" compareValue="5" prepend="and"> ifnull(a.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 0</isEqual>
+          </isNotNull>
         </dynamic>
         )a
         <include refid="sql.pagedynamic"></include>
diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml
index 4027a21..22ab650 100644
--- a/FO/Views/CRoom/Index.cshtml
+++ b/FO/Views/CRoom/Index.cshtml
@@ -65,7 +65,7 @@
 {
 <div class="lctcScore">
     <div class="lctCont" style="padding-bottom:0">
-        @if (Model.Lect.isoffabs != null)
+        @if (Model.Lect.isoffabs != null && Model.Lect.typeedu != 32)
         {
         <h5>집체교육 안내</h5>
         <table>
diff --git a/FO/Views/Course/ApplyAgree.cshtml b/FO/Views/Course/ApplyAgree.cshtml
index 2033f10..096ef74 100644
--- a/FO/Views/Course/ApplyAgree.cshtml
+++ b/FO/Views/Course/ApplyAgree.cshtml
@@ -52,7 +52,12 @@
                                 strEduInfo += string.Format("<span> 교육종료일 {0} </span> | ", Model.SelectCMInningscd.eend2);
                                 strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime);
                                 strEduInfo += string.Format("<span class='red'> {0}과정 </span><br />", (Model.CM.isrefund == 1 ? "환급" : "비환급"));
-                                strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
+
+                                if (Model.CM.typeedu != "32")
+                                {
+                                    strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
+                                }
+
                                 strEduInfo += string.Format("<span style='margin-left:5px;'>교육비 : {0}원</span>", Model.CM.infee.ToString("#,0"));
 
 
@@ -220,11 +225,13 @@
             온라인교육은 신청일로 부터 <span class="subTxt red">최대 1년 이내</span>에 수료하셔야 하며 <span class="subTxt red">1년 이내</span>에 교육수료가 되지 않으면 수료 및 환불이 불가능합니다.
         </p>
 
+        if (Model.CM.typeedu != "32")
+        {
         <h4 class="clsTitle">집체교육(7시간)일정 관련 안내</h4>
         <p class="subTxt">
             교육 신청 시 지정하신 집체교육일에 접수인원이 적은 경우 해당 일자의 집체교육은 폐강되어 다른 일정으로 변경 하셔야 될 수도 있습니다. 꼭! 참고 부탁 드립니다.
         </p>
-
+        }
     }
     <h4 class="clsTitle">주의사항</h4>
     <p class="subTxt" style="border: 3px solid red; padding: 5px; margin: 10px;">
diff --git a/FO/Views/Course/ApplyComplete.cshtml b/FO/Views/Course/ApplyComplete.cshtml
index 93caf99..c191632 100644
--- a/FO/Views/Course/ApplyComplete.cshtml
+++ b/FO/Views/Course/ApplyComplete.cshtml
@@ -53,7 +53,12 @@ else
                                 strEduInfo += string.Format("<span> 교육종료일 {0} </span> | ", Model.SelectCMInningscd.eend2);
                                 strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime);
                                 strEduInfo += string.Format("<span class='red'> {0}과정 </span><br />", (Model.CM.isrefund == 1 ? "환급" : "비환급"));
-                                strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
+
+                                if (Model.CM.typeedu != "32")
+                                {
+                                    strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
+                                }
+
                                 strEduInfo += string.Format("<span style='margin-left:5px;'>교육비 : {0}원</span>", Model.CM.infee.ToString("#,0"));
 
 
diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml
index a291795..5f65734 100644
--- a/FO/Views/Course/ApplyEdu.cshtml
+++ b/FO/Views/Course/ApplyEdu.cshtml
@@ -68,7 +68,12 @@
                                 strEduInfo += string.Format("<span> 교육종료일 {0} </span> | ", Model.SelectCMInningscd.eend2);
                                 strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime);
                                 strEduInfo += string.Format("<span class='red'> {0}과정 </span><br />", (Model.CM.isrefund == 1 ? "환급" : "비환급"));
-                                strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
+
+                                if(Model.CM.typeedu != "32")
+                                {
+                                    strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
+                                }
+
                                 strEduInfo += string.Format("<span style='margin-left:5px;'>교육비 : {0}원</span>", Model.CM.infee.ToString("#,0"));
                             }
 
diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml
index 011cced..6c4593f 100644
--- a/FO/Views/Course/ApplyPay.cshtml
+++ b/FO/Views/Course/ApplyPay.cshtml
@@ -71,7 +71,12 @@
                                 strEduInfo += string.Format("<span> 교육종료일 {0} </span> | ", Model.SelectCMInningscd.eend2);
                                 strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime);
                                 strEduInfo += string.Format("<span class='red'> {0}과정 </span><br />", (Model.CM.isrefund == 1 ? "환급" : "비환급"));
-                                strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
+
+                                if (Model.CM.typeedu != "32")
+                                {
+                                    strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
+                                }
+
                                 strEduInfo += string.Format("<span style='margin-left:5px;'>교육비 : {0}원</span>", Model.CM.infee.ToString("#,0"));
 
                                 //strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml
index 7834fa2..d9f06c7 100644
--- a/FO/Views/Course/SmartSearch.cshtml
+++ b/FO/Views/Course/SmartSearch.cshtml
@@ -405,7 +405,7 @@
             else if (cshape == 2 && typeedu == "32") //온라인 & 안전관리계속교육
             {
                 strTmp = "※ <span style='font-weight: bold; font-size: 12pt;'>교육비 입금과 동시에 동영상강의 시청이 가능합니다.</span><br>" +
-                        "</div><br><span class='clsTitle'>교육종료일(집체교육 참석일)을 선택하여 주세요.</span>";
+                    "</div><br><span class='clsTitle'>교육종료일을 선택하여 주세요.</span>";
             }
             else if (cshape == 2) //온라인
             {
diff --git a/FO/Web.config b/FO/Web.config
index edcdb65..17520dd 100644
--- a/FO/Web.config
+++ b/FO/Web.config
@@ -41,8 +41,8 @@
     <add key="daokey" value="ynictelms2020" />
     
     <!--<add key="configpath" value="Product" />-->
-    <!--<add key="configpath" value="ProductDev" />-->
-    <add key="configpath" value="Staging" />
+    <add key="configpath" value="ProductDev" />
+    <!--<add key="configpath" value="Staging" />-->
     
     <add key="thumbnailexe" value="D:\\dev_tool\\ffmpeg.exe" />