diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 14494a9..48d5a75 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -658,6 +658,7 @@ namespace NP.BO.Controllers
ht.Add("edateall", vm.stringval9);
ht.Add("asname", vm.stringval10);
ht.Add("mobile", vm.stringval11);
+ ht.Add("ustatus", 1);
if (!string.IsNullOrEmpty(vm.stringval6))
{
ht.Add(vm.stringval6, vm.stringval7);
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 6754165..c64f02d 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -859,7 +859,7 @@
and b.extype = #extype#
and a.cmno = #cmno#
and a.isrebate=#isrebate#
- date_format((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end),'%Y-%m-%d') = #edate#
+ and (date_format((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end),'%Y-%m-%d') = #edate#)
and b2.cshape = #cshape#
and b2.cname like concat('%',#cname#,'%')
and b2.cname like concat('%',#cname#,'%')
@@ -879,7 +879,8 @@
and (case when b2.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) >= date_format(#sdateall#,'%Y-%m-%d 00:00:00')
and (case when b2.cshape = 2 then f.eend else a.edate end) <= date_format(#edateall#,'%Y-%m-%d 23:59:59')
and e.asname like concat('%',#asname#,'%')
- cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')
+ and (cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%'))
+ and d.status = #ustatus#
) a
order by a.rno
@@ -1103,7 +1104,7 @@
left outer join cminningscd h on h.cmisno = a.cmisno
left outer join comcode i on i.ccode = h.studyplace and i.isuse=1
where a.status=1 and a.ischanged=0
- date_format((case when g.cshape = 2 and h.eend is not null then h.eend else a.edate end),'%Y-%m-%d') = #edate#
+ and date_format((case when g.cshape = 2 and h.eend is not null then h.eend else a.edate end),'%Y-%m-%d') = #edate#
and g.cshape = #cshape#
and g.cname like concat('%',#cname#,'%')
and g.cname like concat('%',#cname#,'%')
@@ -1127,7 +1128,8 @@
and (case when g.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) >= date_format(#sdateall#,'%Y-%m-%d 00:00:00')
and (case when g.cshape = 2 then h.eend else a.edate end) <= date_format(#edateall#,'%Y-%m-%d 23:59:59')
and e.asname like concat('%',#asname#,'%')
- cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')
+ and cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')
+ and d.status = #ustatus#
) a
order by rno