KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
hyunho 2020-12-15 08:21:06 +00:00
parent 4120360d04
commit c7f412011f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Base/Controller/FOCommon.cs
View File

@ -371,7 +371,7 @@ namespace NP.Base.Controllers
[HttpPost] [HttpPost]
public JsonResult GetSubCm(int cmno, int? studyplace = null) public JsonResult GetSubCm(int cmno, int? studyplace = null)
{ {
var result = Dao.Get<CM>("cm.subcms", new System.Collections.Hashtable() { { "cmno", cmno }, { "studyplace", studyplace } }); var result = Dao.Get<CM>("cm.subcms", new System.Collections.Hashtable() { { "cmno", cmno }, { "studyplace", studyplace } }).Where(w => w.isuse == 1).ToList();
return JsonBack(result); return JsonBack(result);
} }

4
FO/Controllers/CourseController.cs
View File

@ -760,11 +760,11 @@ namespace NP.FO.Controllers
if (vm.stringval == "0" || string.IsNullOrEmpty(vm.stringval)) if (vm.stringval == "0" || string.IsNullOrEmpty(vm.stringval))
{ {
vm.CMs = Dao.Get<CM>("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>("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") else if (vm.stringval == "1")
{ {
vm.CMs = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "cgno", vm.stringval3 } }); vm.CMs = Dao.Get<CM>("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.ComCodes2 = GetComCodes("typeman");
vm.ComCodes3 = GetComCodes("typeedu"); vm.ComCodes3 = GetComCodes("typeedu");