diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 364a2eb..efc1817 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -799,6 +799,11 @@ namespace NP.BO.Controllers vm.stringval = DateTime.Now.ToString("yyyy-MM-01"); vm.stringval2 = Convert.ToDateTime(vm.stringval).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd"); } + if (SUserInfo.IsSiteAdmin) + { + ht.Add("asno", SUserInfo.ASNo); + ViewBag.IsSiteAdmin = SUserInfo.IsSiteAdmin; + } ht.Add("cdts", vm.stringval); ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59")); ht.Add("asname", string.IsNullOrEmpty(vm.stringval3) ? null : vm.stringval3); diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index d531411..cf2c0b3 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1374,6 +1374,7 @@ and a.cdt >= #cdts# and a.cdt <= #cdte# and ass.asname like concat('%',#asname#,'%') + and ass.asno = #asno# and a.userno = #userno# a.isrebate = #isrebate# u.username like concat('%',#username#,'%')