From f284ec0a229d32a72eb5ff7397f3b0507fdb2eb3 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 02 Dec 2021 17:07:23 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 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 d09a27a..e07c129 100644
--- a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
+++ b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -33,11 +33,36 @@
         <result column="approve" property="approve"/>
         <result column="jurisdiction" property="jurisdiction"/>
         <result column="overtime" property="overtime"/>
+        <result column="approve" property="approve"/>
+        <result column="papprove" property="papprove"/>
+        <result column="xapprove" property="xapprove"/>
+        <result column="sapprove" property="sapprove"/>
+        <result column="popinion" property="popinion"/>
+        <result column="xopinion" property="xopinion"/>
+        <result column="sopinion" property="sopinion"/>
     </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=#{record.ptype}
+        </if>
+        <if test="revoke.jurisdiction!=null and revoke.jurisdiction != '' and revoke.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{record.jurisdiction} or sj.parent_id = #{record.jurisdiction})
+        </if>
+        <if test="revoke.papprove!=null and revoke.papprove!=''">
+            and papprove=#{record.papprove}
+        </if>
+        <if test="revoke.xapprove!=null and revoke.xapprove!=''">
+            and xapprove=#{record.xapprove}
+        </if>
+        <if test="revoke.sapprove!=null and revoke.sapprove!=''">
+            and sapprove=#{record.sapprove}
+        </if>
     </select>
     <select id="selectIn" resultType="java.util.HashMap">
         select * from sys_revoke where cardid=#{cardid} and ptype=#{type}

--
Gitblit v1.9.3