From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
index decae77..1d214ad 100644
--- a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
+++ b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -30,18 +30,44 @@
         <result column="contactscell" property="contactscell"/>
         <result column="approve" property="approve"/>
         <result column="jurisdiction" property="jurisdiction"/>
+        <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"/>
+        <result column="overtime" property="overtime"/>
     </resultMap>
 
 
     <select id="selectPermitPage" resultMap="permitResultMap">
         select *
-        from sys_permit
+        from sys_permit si left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction where 1=1
+        <if test="permit.ptype!=null and permit.ptype!=''">
+            and ptype=#{record.ptype}
+        </if>
+        <if test="permit.jurisdiction!=null and permit.jurisdiction != '' and permit.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{record.jurisdiction} or sj.parent_id = #{record.jurisdiction})
+        </if>
+        <if test="permit.papprove!=null and permit.papprove!=''">
+            and papprove=#{record.papprove}
+        </if>
+        <if test="permit.xapprove!=null and permit.xapprove!=''">
+            and xapprove=#{record.xapprove}
+        </if>
+        <if test="permit.sapprove!=null and permit.sapprove!=''">
+            and sapprove=#{record.sapprove}
+        </if>
     </select>
 
     <select id="selectIn" resultType="java.util.HashMap">
         select *
         from sys_permit
-        where cardid = #{cardid} and ptype=#{type }
+        where cardid = #{cardid}
+          and ptype = #{type }
     </select>
 
     <insert id="insertPer" useGeneratedKeys="true" keyProperty="id">

--
Gitblit v1.9.3