From 9fb370afff71f4d5659d8904e8751479280d5b48 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 09:26:50 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
index ae82b5c..e91b8ae 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -245,8 +245,12 @@
<!-- </if>-->
<!-- </where>-->
FROM ir_irrigate_group grp
+ INNER JOIN ir_project_group pg ON pg.group_id = grp.id
<where>
AND grp.deleted = 0
+ <if test="projectId != null">
+ AND pg.project_id = #{projectId}
+ </if>
<if test="groupCode != null and groupCode != ''">
AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')
</if>
@@ -283,8 +287,14 @@
grp.default_duration AS defaultDuration,
0 as sort
FROM ir_irrigate_group grp
+ INNER JOIN ir_project_group pg ON pg.group_id = grp.id
<where>
AND grp.deleted = 0
+
+ <if test="projectId != null">
+ AND pg.project_id = #{projectId}
+ </if>
+
<if test="groupCode != null and groupCode != ''">
AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')
</if>
--
Gitblit v1.8.0