From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改

---
 src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
index 0fa164b..10d37b7 100644
--- a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
+++ b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -32,13 +32,32 @@
         <result column="storage" property="storage"/>
         <result column="approve" property="approve"/>
         <result column="jurisdiction" property="jurisdiction"/>
+        <result column="overtime" property="overtime"/>
     </resultMap>
 
 
     <select id="selectRevokePage" resultMap="revokeResultMap">
-        select * from sys_revoke
+        select * from sys_revoke si left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction where 1=1
+        <if test="revoke.ptype!=null and revoke.ptype!=''">
+            and ptype=#{revoke.ptype}
+        </if>
+        <if test="revoke.jurisdiction!=null and revoke.jurisdiction != '' and revoke.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{revoke.jurisdiction} or sj.parent_id = #{revoke.jurisdiction})
+        </if>
+        <!--        <if test="revoke.usetype=='1'.toString()">-->
+        <!--            and jurisdiction in(${jurisdiction})-->
+        <!--        </if>-->
+        <!--        <if test="revoke.usetype=='2'.toString()">-->
+        <!--            and  jurisdiction=#{revoke.jurisdiction}-->
+        <!--        </if>-->
     </select>
     <select id="selectIn" resultType="java.util.HashMap">
-        select * from sys_revoke where cardid=#{cardid} and ptype=#{type}
+        select *
+        from sys_revoke
+        where cardid = #{cardid}
+          and ptype = #{type}
     </select>
 </mapper>

--
Gitblit v1.9.3