From 84e8a5e53cd8b56193211c8b99d1a43be2b46434 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 五月 2024 21:11:18 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 c99a293..720841c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -227,11 +227,11 @@
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
- <if test = "divideId != null">
+ <if test = "divideId != null and divideId !=''">
AND divi.id = #{divideId}
</if>
- <if test = "blockId != null">
+ <if test = "blockId != null and blockId !=''">
AND blo.id = #{blockId}
</if>
@@ -283,11 +283,11 @@
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
- <if test = "divideId != null">
+ <if test = "divideId != null and divideId !=''">
AND divi.id = #{divideId}
</if>
- <if test = "blockId != null">
+ <if test = "blockId != null and blockId !=''">
AND blo.id = #{blockId}
</if>
--
Gitblit v1.8.0