From 894d733a70bd7b66b1f515a37c11c18c4ab1f151 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 八月 2024 10:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 93e6e80..f2a1069 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -26,7 +26,7 @@
select
<include refid="Base_Column_List" />
from ba_block
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT} and deleted = 0
</select>
<select id="selectAll" resultMap="BaseResultMap">
@@ -34,6 +34,7 @@
<!-- <include refid="part_Column_List" />-->
<include refid="Base_Column_List" />
from ba_block
+ WHERE deleted = 0
</select>
<select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
@@ -51,7 +52,7 @@
phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="area != null">
- area = ${area} and
+ area = #{area,jdbcType=INTEGER} and
</if>
</trim>
</select>
@@ -61,6 +62,7 @@
<include refid="Base_Column_List" />
from ba_block
<trim prefix="where " suffixOverrides="and">
+ deleted = 0 and
<if test="name != null and name != ''">
name like concat('%', #{name}, '%') and
</if>
@@ -71,7 +73,7 @@
phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="area != null">
- area = ${area} and
+ area = #{area,jdbcType=INTEGER} and
</if>
</trim>
order by id DESC
--
Gitblit v1.8.0