diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index efc1817..67f70fa 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -807,10 +807,10 @@ namespace NP.BO.Controllers
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);
- ht.Add("isrebate", string.IsNullOrEmpty(vm.stringval4) ? null : "1");
- if (!string.IsNullOrEmpty(vm.stringval16))
+ ht.Add("isrebates", vm.stringval4);
+ if (!string.IsNullOrEmpty(vm.stringval6))
{
- ht.Add(vm.stringval15 ?? "usernameiditemname", vm.stringval16);
+ ht.Add(vm.stringval5 ?? "usernameiditemname", vm.stringval6);
}
vm.stringval20 = DateTime.Now.AddDays(-6).ToString("yyyy-MM-dd") + ";" +
DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd") + ";" +
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index cf2c0b3..e77fad3 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1376,10 +1376,10 @@
and ass.asname like concat('%',#asname#,'%')
and ass.asno = #asno#
and a.userno = #userno#
- a.isrebate = #isrebate#
- u.username like concat('%',#username#,'%')
- u.userid like concat('%',#userid#,'%')
- b.cname like concat('%',#cname#,'%')
+ and ifnull(a.isrebate,0) in ($isrebates$)
+ and u.username like concat('%',#username#,'%')
+ and u.userid like concat('%',#userid#,'%')
+ and b.cname like concat('%',#itemname#,'%')
and(u.username like concat('%',#usernameiditemname#,'%') or u.userid like concat('%',#usernameiditemname#,'%') or b.cname like concat('%',#usernameiditemname#,'%'))
) a