From bda1153c2e149098782b6b25970a5aba0bb74640 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 12 Nov 2021 09:15:28 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
index 4d04752..1a870b9 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -46,29 +46,38 @@
 
 
     <select id="selectRecordPage" resultMap="recordResultMap">
-        select * from sys_record where 1=1
+        select * from sys_record si left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction where 1=1
         <if test="record.ptype!=null and record.ptype!=''">
-            and  ptype=#{record.ptype}
+            and ptype=#{record.ptype}
         </if>
-        <if test="record.usetype=='1'.toString()">
-            and jurisdiction in(${jurisdiction})
+        <if test="record.jurisdiction!=null and record.jurisdiction != '' and record.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{record.jurisdiction} or sj.parent_id = #{record.jurisdiction})
         </if>
-        <if test="record.usetype=='2'.toString()">
-            and  jurisdiction=#{record.jurisdiction}
-        </if>
+        <!--        <if test="record.usetype=='1'.toString()">-->
+        <!--            and jurisdiction in(${jurisdiction})-->
+        <!--        </if>-->
+        <!--        <if test="record.usetype=='2'.toString()">-->
+        <!--            and  jurisdiction=#{record.jurisdiction}-->
+        <!--        </if>-->
         <if test="record.papprove!=null and record.papprove!=''">
-            and  papprove=#{record.papprove}
+            and papprove=#{record.papprove}
         </if>
         <if test="record.xapprove!=null and record.xapprove!=''">
-            and  xapprove=#{record.xapprove}
+            and xapprove=#{record.xapprove}
         </if>
         <if test="record.sapprove!=null and record.sapprove!=''">
-            and  sapprove=#{record.sapprove}
+            and sapprove=#{record.sapprove}
         </if>
     </select>
 
     <select id="selectIn" resultType="java.util.HashMap">
-        select * from sys_record where cardid=#{cardid} and ptype=#{type}
+        select *
+        from sys_record
+        where cardid = #{cardid}
+          and ptype = #{type}
     </select>
 
 </mapper>

--
Gitblit v1.9.3