diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index ad06720..24e70a3 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -583,7 +583,7 @@ namespace NP.BO.Controllers vm.LectEXes = new List() { }; if (vm.CMEXes.Count() > 0) { - vm.LectEXes = Dao.Get("lect.lectexes", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "exno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMEXes.First().exno }, { "isrebate", vm.addstringval2 }, { "estate", vm.addstringval3 } }); + vm.LectEXes = Dao.Get("lect.lectexes", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "exno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMEXes.First().exno }, { "isrebate", vm.addstringval2 }, { "estate", vm.addstringval3 },{"ustatus",1 } }); } vm.pagetotalcount = GetCount(vm.LectEXes); } @@ -600,7 +600,7 @@ namespace NP.BO.Controllers } if (vm.CMSDs.Count() > 0) { - vm.LectSDs = Dao.Get("lect.lectsds", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 }, { "sdstate", vm.addstringval3 }, { "isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1 } }); + vm.LectSDs = Dao.Get("lect.lectsds", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 }, { "sdstate", vm.addstringval3 }, { "isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1 } ,{"ustatus",1 } }); } vm.pagetotalcount = GetCount(vm.LectSDs); } @@ -617,7 +617,7 @@ namespace NP.BO.Controllers } if (vm.CMSDs.Count() > 0) { - var _ht = new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 } }; + var _ht = new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 },{"ustatus",1 } }; if (!string.IsNullOrEmpty(vm.addstringval3)) { _ht.Add("dcount", "=" + vm.addstringval3); diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index c64f02d..5a25a1c 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -815,7 +815,7 @@ from lect a inner join cmex b on b.isdel=0 and b.exno=#exno# left outer join lectex c on c.lectno=a.lectno and c.exno=b.exno - inner join users d on d.userno=a.userno + inner join users d on d.userno=a.userno and d.status = #ustatus# left outer join assign e on e.asno=d.asno where a.status=1 and a.ischanged=0 and b.extype = #extype# @@ -1064,7 +1064,7 @@ inner join cmsd b on b.isdel=0 and b.cmno = a.cmno and b.sdno=#sdno# left outer join lectsd c on c.lectno=a.lectno and c.sdno=b.sdno left outer join fileinfo cf on cf.fgno=c.fgno and cf.isdel=0 - inner join users d on d.userno=a.userno + inner join users d on d.userno=a.userno and d.status = #ustatus# left outer join assign e on e.asno=d.asno left outer join mch_source_v_lectsd_list f on f.DOC_ID = concat(b.sdno ,'_',a.lectno ) where a.status=1 and a.ischanged=0 @@ -1235,7 +1235,7 @@ inner join cmsd b on b.isdel=0 and b.sdno=#sdno# left outer join lectsd c on c.lectno=a.lectno and c.sdno=b.sdno left outer join lectsdboard c2 on c2.lectno=c.lectno and c2.sdno=c.sdno and c2.isdel=0 - inner join users d on d.userno=a.userno + inner join users d on d.userno=a.userno and d.status = #ustatus# left outer join assign e on e.asno=d.asno where a.cmno=#cmno# and a.status=1 and a.ischanged=0 and a.isrebate=#isrebate#