From 101fc9289fbdb5eab41369a8150c62871ba466a0 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Fri, 21 May 2021 05:56:55 +0000
Subject: [PATCH] =?UTF-8?q?docprintpast=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?=
 =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=20=EC=BB=AC=EB=9F=BC=20?=
 =?UTF-8?q?=EC=95=94=ED=98=B8=ED=99=94=20=EA=B4=80=EB=A0=A8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dao/MyBatis/Maps/CRoom.xml | 13 +++++++++----
 Dao/MyBatis/Maps/Lect.xml  |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index b8ab5d2..82d2eaf 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -1351,8 +1351,13 @@
           a.*
           from (
           select
-          a.no,a.kind,a.cg,a.cshape,a.username,a.userpno,a.typeman,a.edukind,a.typeedu,a.typegrade,a.typejob,a.cgname,a.completeno,a.companyname,a.companyaddr,a.brno,a.eino,a.btype
-          ,a.bkind,a.ceoname,date_format(a.ssdate, '%Y-%m-%d') ssdate,date_format(a.sedate, '%Y-%m-%d') sedate,a.sctime,a.assign,a.slevel,a.uduty,a.phone,a.mname,a.mphone,a.sprice,a.rprice,a.rbank,a.rbankno,a.rbankuser,a.taxemail,a.syear
+          a.no,a.kind,a.cg,a.cshape,a.username,CAST(AES_DECRYPT(UNHEX(a.userpno), <include refid="sql.digest"></include>) AS char) userpno
+          ,a.typeman,a.edukind,a.typeedu,a.typegrade,a.typejob,a.cgname,a.completeno,a.companyname,a.companyaddr,a.brno,a.eino,a.btype
+          ,a.bkind,a.ceoname,date_format(a.ssdate, '%Y-%m-%d') ssdate,date_format(a.sedate, '%Y-%m-%d') sedate,a.sctime,a.assign,a.slevel,a.uduty
+          ,CAST(AES_DECRYPT(UNHEX(a.phone), <include refid="sql.digest"></include>) AS char) phone,a.mname
+          ,CAST(AES_DECRYPT(UNHEX(a.mphone), <include refid="sql.digest"></include>) AS char) mphone,a.sprice,a.rprice,a.rbank
+          ,CAST(AES_DECRYPT(UNHEX(a.rbankno), <include refid="sql.digest"></include>) AS char) rbankno,a.rbankuser
+          ,CAST(AES_DECRYPT(UNHEX(a.taxemail), <include refid="sql.digest"></include>) AS char) taxemail,a.syear
           ,row_number() over(order by a.ssdate desc) rno
           ,count(a.ssdate) over() pagetotalcount
           from docprintpast a
@@ -1368,10 +1373,10 @@
             <isNotNull property="word">
               <isNotNull property="text">
               <isEqual property="word" compareValue="username" prepend="and"> a.username like concat('%',#text#,'%')</isEqual>
-              <isEqual property="word" compareValue="userpno" prepend="and"> a.userpno like concat('%',#text#,'%')</isEqual>
+              <isEqual property="word" compareValue="userpno" prepend="and"> a.userpno =  HEX(AES_ENCRYPT(replace(#text#,'-',''), <include refid="sql.digest"></include>))</isEqual>
               <isEqual property="word" compareValue="completeno" prepend="and"> a.completeno like concat('%',#text#,'%')</isEqual>
               <isEqual property="word" compareValue="companyname" prepend="and"> a.companyname like concat('%',#text#,'%')</isEqual>
-              <isEqual property="word" compareValue="brno" prepend="and"> a.username brno concat('%',#text#,'%')</isEqual>
+              <isEqual property="word" compareValue="brno" prepend="and"> a.brno like concat('%',#text#,'%')</isEqual>
               </isNotNull>
             </isNotNull>
           ) a
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 99b82ad..ade1d3b 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1559,7 +1559,7 @@
         select  no lectno,substr(a.cshape,1,3) cshapename2,a.cgname cname,a.ssdate sstime,a.sedate setime
           ,case when a.rprice> 0  then 1 else 0 end isrebate
         from docprintpast a
-        inner join users b on CAST(AES_DECRYPT(UNHEX(b.userpno), <include refid="sql.digest"></include>) AS char) = replace(a.userpno,'-','')
+        inner join users b on b.userpno= a.userpno
         where userno = #userno#
       </select>
       <update id="lect.drop2day" parameterClass="hashtable">