From b4985b58a50ee0ca15a5e7576e4d50eff04d6e3d Mon Sep 17 00:00:00 2001
From: hyunho <hyunho  @example.com>
Date: Fri, 6 Nov 2020 09:41:15 +0000
Subject: [PATCH]

---
 Base/Controller/FCommon.cs         |  2 +-
 FO/Controllers/CourseController.cs |  2 +-
 FO/Views/Course/SmartSearch.cshtml | 18 ++++++++++++------
 FO/Views/Home/Index.cshtml         |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Base/Controller/FCommon.cs b/Base/Controller/FCommon.cs
index d9832b8..43dd4b4 100644
--- a/Base/Controller/FCommon.cs
+++ b/Base/Controller/FCommon.cs
@@ -271,7 +271,7 @@ namespace NP.Base.Controllers
             }
             else
             {
-                ppllog.cgno = !string.IsNullOrEmpty(vm.stringval3) ? Convert.ToInt32(vm.stringval6) : (int?)null;
+                ppllog.cgno = !string.IsNullOrEmpty(vm.stringval3) ? Convert.ToInt32(vm.stringval3) : (int?)null;
             }
             if (!string.IsNullOrEmpty(Request["cmisno"]))
                 ppllog.cmisno = Convert.ToInt64(Request["cmisno"]);
diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs
index 758e017..02dfb61 100644
--- a/FO/Controllers/CourseController.cs
+++ b/FO/Controllers/CourseController.cs
@@ -765,7 +765,7 @@ namespace NP.FO.Controllers
             }
             else if (vm.stringval == "1")
             {
-                vm.CMs = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "cgcode", vm.stringval3 } });
+                vm.CMs = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "cgno", vm.stringval3 } });
             }
             return View(vm);
         }
diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml
index d0cf1d5..d2bc67e 100644
--- a/FO/Views/Course/SmartSearch.cshtml
+++ b/FO/Views/Course/SmartSearch.cshtml
@@ -48,7 +48,7 @@
                         </select>
                     </li>
                     <li>
-                        @Html.DropDownListFor(x => x.stringval3, new SelectList(Model.CMsEtc, "cgcode", "cgname"))
+                        @Html.DropDownListFor(x => x.stringval3, new SelectList(Model.CMsEtc, "cgno", "cgname"))
                     </li>
                     <li><a href="#" id="btnSearch">검색</a></li>
                 </ul>
@@ -132,16 +132,21 @@
     $(document).ready(function () {
         $('#liTab1').click(function () {
             $("#stringval").val("0");
+            $("#stringval3").val("@Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman").FirstOrDefault().ccode");
+            $("#stringval4").val("@Model.ComCodes.Where(w => w.cgroup.ToString() == "typeedu").FirstOrDefault().ccode");
+            $("#stringval5").val("@Model.ComCodes.Where(w => w.cgroup.ToString() == "typegrade").FirstOrDefault().ccode");
+            $("#stringval6").val("@Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob").FirstOrDefault().ccode");
             setTimeout(function () {
                 $("#smartSearchForm").submit();
-            }, 500);
-            
+            }, 1000);
+
         });
         $('#liTab2').click(function () {
             $("#stringval").val("1");
+            $("#stringval3").val("@Model.CMsEtc.FirstOrDefault().cgno");
             setTimeout(function () {
                 $("#smartSearchForm").submit();
-            }, 500);
+            }, 1000);
         });
         $('#btnSearch').click(function () {
             if ($("#liTab1").hasClass("current")) {
@@ -152,7 +157,7 @@
             }
             setTimeout(function () {
                 $("#smartSearchForm").submit();
-            }, 500);
+            }, 1000);
         });
 
         $("#stringval").change(function () {
@@ -190,7 +195,7 @@
         if ($("#stringval").val() == "1") {
             cmkind = $("#stringval3").find("option:selected").text();
         }
-        
+
         $.each(capResult.obj, function (i, d) {
             $("#spnCmTitle").text(d.text);
             $("#spnCmKind").text(cmkind);
@@ -273,6 +278,7 @@
     }
 
     function applyClass(cmno) {
+
         $("#cmno").val(cmno);
         $("#smartSearchForm").attr("action", "/Course/ApplyEdu").submit();
     }
diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml
index 77a8b85..310c8ff 100644
--- a/FO/Views/Home/Index.cshtml
+++ b/FO/Views/Home/Index.cshtml
@@ -190,7 +190,7 @@
                                         <ul>
                                             @foreach (var t in Model.CMsEtc)
                                             {
-                                                <li><a href="javascript:schIpt('2', '@t.cgcode', '@t.cgname');">@t.cgname</a></li>
+                                                <li><a href="javascript:schIpt('2', '@t.cgno', '@t.cgname');">@t.cgname</a></li>
                                             }
                                         </ul>
                                     </div>