diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 560cbe8..95416ed 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -808,12 +808,12 @@
 			      ,case when p.rstatus=0 and pr.rstatus = 0 and pri.rfdno is not null then 1 else 0 end isrefundcall
 			      ,u.userno,u.userid,u.username
             ,concat(substring(CAST(AES_DECRYPT(UNHEX(u.userpno),<include refid="sql.digest"></include>) as char),1,6),'-',substring(CAST(AES_DECRYPT(UNHEX(u.userpno),<include refid="sql.digest"></include>) as char),7,7)) userpno
-			      ,cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) as mobile
-			      ,ua.asname,ua.isjoin
-			      ,cm.cshape,cm.sstime,cm.setime,cm.studyplace
-			      ,le.sdate,le.edate,le.iscomplete,le.attrate
-			      ,case when a.isexamready=1 then uee.exname else case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end end itemname
-			      ,ppl.rbankname,CAST(AES_DECRYPT(UNHEX(ppl.rbankacc), <include refid="sql.digest"></include>) AS char) rbankacc,ppl.rbankowner
+			,cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) as mobile
+			,pp.asname,ua.isjoin
+			,cm.cshape,cm.sstime,cm.setime,cm.studyplace
+			,le.sdate,le.edate,le.iscomplete,le.attrate
+			,case when a.isexamready=1 then uee.exname else case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end end itemname
+			,ppl.rbankname,CAST(AES_DECRYPT(UNHEX(ppl.rbankacc), <include refid="sql.digest"></include>) AS char) rbankacc,ppl.rbankowner
             ,row_number() over(order by case when pr.rstatus=0 and pri.rfdno is not null then 0 else 1 end, case when a.isexamready=1 then ue.cdt else p.cdt end desc) rno
             ,count(p.payno) over() pagetotalcount
             ,scd.estart cmiestart, scd.eend cmieeend, scd.studyplace cmistudyplace
@@ -885,27 +885,28 @@
               <isNotNull property="usernameiditemname">and (u.username=#usernameiditemname# or u.userid=#usernameiditemname# or ex.exname like concat('%',#usernameiditemname#,'%') or ua.asname like concat('%',#usernameiditemname#,'%'))</isNotNull>
               <isNotNull property="isgroup">and a.exno=0</isNotNull>
 			        <isNotNull property="mobile" prepend="and">cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotNull>
-            ) a
-            left outer join pay p on a.isexamready=0 and p.payno=a.payno
-            left outer join payitem pi on a.isexamready=0 and pi.pino=case when a.pi1=0 then a.pi2 else a.pi1 end
-            left outer join examuser ue on a.isexamready=1 and ue.exno=a.payno and ue.userno=a.pi1
-            left outer join exam uee on a.isexamready=1 and uee.exno=ue.exno
-            inner join users u on u.userno=case when a.isexamready=0 then p.userno else ue.userno end
-            left outer join assign ua on ua.asno=u.asno
-            left outer join payrfditem pri on a.isexamready=0 and pri.pino=pi.pino
-            left outer join payrfd pr on a.isexamready=0 and pr.rfdno=pri.rfdno
-            left outer join cm cm on a.isexamready=0 and pi.ptype in (0,1,4) and cm.cmno=pi.itemno
-            left outer join lect le on a.isexamready=0 and le.pino=pi.pino and le.ischanged=0
-            left outer join book bk on a.isexamready=0 and pi.ptype=2 and bk.bkno=pi.itemno
-            left outer join exam ex on a.isexamready=0 and ex.exno=pi.itemno
-            left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno
-            left outer join pplog ppl on ppl.pplno = p.pplno           
-            left outer join cminningscd scd on scd.cmisno = le.cmisno    
-            left outer join comcode cc1 on cc1.ccode = ppl.typegrade
-            left outer join comcode cc2 on cc2.ccode = ppl.typeedu
-            left outer join comcode cc3 on cc3.ccode = ppl.typeman
-            left outer join comcode cc4 on cc4.ccode = ppl.typejob
-            <dynamic prepend="where">
+			) a
+			left outer join pay p on a.isexamready=0 and p.payno=a.payno
+			left outer join payitem pi on a.isexamready=0 and pi.pino=case when a.pi1=0 then a.pi2 else a.pi1 end
+			left outer join examuser ue on a.isexamready=1 and ue.exno=a.payno and ue.userno=a.pi1
+			left outer join exam uee on a.isexamready=1 and uee.exno=ue.exno
+			inner join users u on u.userno=case when a.isexamready=0 then p.userno else ue.userno end
+			left outer join pplog pp on p.pplno = pp.pplno
+			left outer join assign ua on ua.asno=u.asno
+			left outer join payrfditem pri on a.isexamready=0 and pri.pino=pi.pino
+			left outer join payrfd pr on a.isexamready=0 and pr.rfdno=pri.rfdno
+			left outer join cm cm on a.isexamready=0 and pi.ptype in (0,1,4) and cm.cmno=pi.itemno
+			left outer join lect le on a.isexamready=0 and le.pino=pi.pino and le.ischanged=0
+			left outer join book bk on a.isexamready=0 and pi.ptype=2 and bk.bkno=pi.itemno
+			left outer join exam ex on a.isexamready=0 and ex.exno=pi.itemno
+			left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno
+			left outer join pplog ppl on ppl.pplno = p.pplno
+			left outer join cminningscd scd on scd.cmisno = le.cmisno
+			left outer join comcode cc1 on cc1.ccode = ppl.typegrade
+			left outer join comcode cc2 on cc2.ccode = ppl.typeedu
+			left outer join comcode cc3 on cc3.ccode = ppl.typeman
+			left outer join comcode cc4 on cc4.ccode = ppl.typejob
+			<dynamic prepend="where">
                <isNotNull property="estart" prepend="and">scd.estart &gt;= #estart#</isNotNull>
                <isNotNull property="eend" prepend="and">scd.eend &lt;= #eend#</isNotNull>
                <isNotNull property="studyplace" prepend="and">scd.studyplace=#studyplace#</isNotNull>