From 62639dc2767d23652aed814ec8916c9db203fa42 Mon Sep 17 00:00:00 2001
From: kdh0120 <kdh0120  @example.com>
Date: Wed, 17 Nov 2021 23:37:25 +0000
Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=20?=
 =?UTF-8?q?=ED=86=B5=ED=95=A9=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=20.=20563=20BO/Controllers/croomController.cs=20Dao/MyBatis/Ma?=
 =?UTF-8?q?ps/Lect.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Controllers/croomController.cs |  1 +
 Dao/MyBatis/Maps/Lect.xml         | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

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 @@
               <isNotNull property="extype">and b.extype = #extype#</isNotNull>
               <isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
               <isNotNull property="isrebate">and a.isrebate=#isrebate#</isNotNull>
-              <isNotNull property="edate" prepend="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#</isNotNull>
+              <isNotNull property="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#)</isNotNull>
               <isNotNull property="cshape">and b2.cshape = #cshape#</isNotNull>
               <isNotEmpty property="cname">and b2.cname like concat('%',#cname#,'%')</isNotEmpty>
               <isNotEmpty property="cnamestr">and b2.cname like concat('%',#cname#,'%')</isNotEmpty>
@@ -879,7 +879,8 @@
               <isNotEmpty property="sdateall">and (case when b2.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
               <isNotEmpty property="edateall">and (case when b2.cshape = 2 then f.eend else a.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
               <isNotEmpty property="asname">and e.asname like concat('%',#asname#,'%')</isNotEmpty>
-			  <isNotNull property="mobile" prepend="and">cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotNull>
+			        <isNotNull property="mobile">and (cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%'))</isNotNull>
+              <isNotNull property="ustatus">and d.status = #ustatus#</isNotNull>
           ) a
           <include refid="sql.pagedynamic"></include>
           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
-            <isNotNull property="edate" prepend="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#</isNotNull>
+            <isNotNull property="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#</isNotNull>
             <isNotNull property="cshape">and g.cshape = #cshape#</isNotNull>
             <isNotEmpty property="cname">and g.cname like concat('%',#cname#,'%')</isNotEmpty>
             <isNotEmpty property="cnamestr">and g.cname like concat('%',#cname#,'%')</isNotEmpty>
@@ -1127,7 +1128,8 @@
             <isNotEmpty property="sdateall">and (case when g.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
             <isNotEmpty property="edateall">and (case when g.cshape = 2 then h.eend else a.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
             <isNotNull property="asname">and e.asname like concat('%',#asname#,'%')</isNotNull>
-			<isNotNull property="mobile" prepend="and">cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotNull>
+			      <isNotNull property="mobile">and cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotNull>
+            <isNotNull property="ustatus">and d.status = #ustatus#</isNotNull>
           ) a
           <include refid="sql.pagedynamic"></include>
           order by rno