From a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 25 Nov 2021 15:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 e84ca89..df6ff14 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -31,11 +31,35 @@
<result column="jurisdiction" property="jurisdiction"/>
<result column="cardid" property="cardid"/>
<result column="ptype" property="ptype"/>
+ <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="selectRecordPage" resultMap="recordResultMap">
- select * from sys_record
+ 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}
+ </if>
+ <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.papprove!=null and record.papprove!=''">
+ and papprove=#{record.papprove}
+ </if>
+ <if test="record.xapprove!=null and record.xapprove!=''">
+ and xapprove=#{record.xapprove}
+ </if>
+ <if test="record.sapprove!=null and record.sapprove!=''">
+ and sapprove=#{record.sapprove}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3