From d52c20ed07bcea2d848bdab25f2c49c21c00d269 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 27 二月 2024 12:56:22 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 85772ad..8470ae2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -216,9 +216,9 @@
FROM pr_intake ge
INNER JOIN pr_divide divi ON ge.divideId = divi.id
INNER JOIN ba_block blo ON divi.blockId = blo.id
- INNER JOIN ba_district country ON ge.countyId = country.id
- INNER JOIN ba_district town ON ge.townId = town.id
- INNER JOIN ba_district village ON ge.villageId = village.id
+ LEFT JOIN ba_district country ON ge.countyId = country.id
+ LEFT JOIN ba_district town ON ge.townId = town.id
+ LEFT JOIN ba_district village ON ge.villageId = village.id
<where>
ge.deleted = 0
AND divi.deleted = 0
@@ -232,7 +232,7 @@
</if>
<if test="blockName != null and blockName != ''">
- AND blo.name = #{blockName}
+ AND blo.name LIKE CONCAT('%', #{blockName}, '%')
</if>
<if test="isBinded == 0">
@@ -265,9 +265,9 @@
FROM pr_intake ge
INNER JOIN pr_divide divi ON ge.divideId = divi.id
INNER JOIN ba_block blo ON divi.blockId = blo.id
- INNER JOIN ba_district country ON ge.countyId = country.id
- INNER JOIN ba_district town ON ge.townId = town.id
- INNER JOIN ba_district village ON ge.villageId = village.id
+ LEFT JOIN ba_district country ON ge.countyId = country.id
+ LEFT JOIN ba_district town ON ge.townId = town.id
+ LEFT JOIN ba_district village ON ge.villageId = village.id
<where>
ge.deleted = 0
AND divi.deleted = 0
@@ -281,7 +281,7 @@
</if>
<if test="blockName != null and blockName != ''">
- AND blo.name = #{blockName}
+ AND blo.name LIKE CONCAT('%', #{blockName}, '%')
</if>
<if test="isBinded == 0">
@@ -299,7 +299,7 @@
</where>
ORDER BY ge.operateDt DESC
<if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
+ LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
</if>
</select>
--
Gitblit v1.8.0