From 00754b2fb8e71be738e6c312e11d62e64a4e82c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Dec 2021 17:13:59 +0800
Subject: [PATCH] 1.二维码批量生成修改，新增图片批量下载 2.用户修改 rtime bug 修改
---
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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..29bf619 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,37 @@
<result column="contactscell" property="contactscell"/>
<result column="approve" property="approve"/>
<result column="jurisdiction" property="jurisdiction"/>
+ <result column="overtime" property="overtime"/>
</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.usetype=='1'.toString()">-->
+<!-- and si.jurisdiction in(${jurisdiction})-->
+<!-- </if>-->
+<!-- <if test="permit.usetype=='2'.toString()">-->
+<!-- and si.jurisdiction=#{permit.jurisdiction}-->
+<!-- </if>-->
+<!-- <if test="permit.usetype==''.toString()">-->
+<!-- and si.jurisdiction=#{permit.jurisdiction}-->
+<!-- </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