diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs index b515aaf..58f85c3 100644 --- a/Base/Controller/FOCommon.cs +++ b/Base/Controller/FOCommon.cs @@ -371,7 +371,7 @@ namespace NP.Base.Controllers [HttpPost] public JsonResult GetSubCm(int cmno, int? studyplace = null) { - var result = Dao.Get("cm.subcms", new System.Collections.Hashtable() { { "cmno", cmno }, { "studyplace", studyplace } }); + var result = Dao.Get("cm.subcms", new System.Collections.Hashtable() { { "cmno", cmno }, { "studyplace", studyplace } }).Where(w => w.isuse == 1).ToList(); return JsonBack(result); } diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index 92af557..8614bd2 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -760,11 +760,11 @@ namespace NP.FO.Controllers if (vm.stringval == "0" || string.IsNullOrEmpty(vm.stringval)) { - vm.CMs = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "typeman", vm.stringval3 }, { "typeedu", vm.stringval4 }, { "typegrade", vm.stringval5 }, { "typejob", vm.stringval6 } }); + vm.CMs = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "typeman", vm.stringval3 }, { "typeedu", vm.stringval4 }, { "typegrade", vm.stringval5 }, { "typejob", vm.stringval6 } }).Where(w=>w.isuse == 1).ToList(); } else if (vm.stringval == "1") { - vm.CMs = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "cgno", vm.stringval3 } }); + vm.CMs = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "cgno", vm.stringval3 } }).Where(w => w.isuse == 1).ToList(); } vm.ComCodes2 = GetComCodes("typeman"); vm.ComCodes3 = GetComCodes("typeedu");