From a97da78dd37c4e11f46650ff71a9706affd9955f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 25 Nov 2021 18:44:31 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 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 de545a2..df47ed8 100644
--- a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
+++ b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -37,11 +37,39 @@
         <result column="xopinion" property="xopinion"/>
         <result column="sopinion" property="sopinion"/>
         <result column="overtime" property="overtime"/>
+        <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"/>
+        <result column="ptime" property="ptime"/>
+        <result column="stime" property="stime"/>
+        <result column="xtime" property="xtime"/>
     </resultMap>
 
 
     <select id="selectPermitPage" resultMap="permitResultMap">
-        select * from sys_permit
+        select si.* 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  si.ptype=#{permit.ptype}
+        </if>
+        <if test="permit.jurisdiction!=null and permit.jurisdiction != '' and permit.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{permit.jurisdiction} or sj.parent_id = #{permit.jurisdiction})
+        </if>
+        <if test="permit.papprove!=null and permit.papprove!=''">
+            and papprove=#{permit.papprove}
+        </if>
+        <if test="permit.xapprove!=null and permit.xapprove!=''">
+            and xapprove=#{permit.xapprove}
+        </if>
+        <if test="permit.sapprove!=null and permit.sapprove!=''">
+            and sapprove=#{permit.sapprove}
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.9.3