From 5cb82c45b0369db9e1dcfe312e93cf0e2acb6c52 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 26 九月 2024 18:53:01 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml index 8fc8bee..f724ab8 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml @@ -1069,6 +1069,7 @@ INNER JOIN pr_intake inta ON inta.id = och.intake_id <where> AND och.cl_ic_card_no IS NOT NULL AND och.client_id IS NOT NULL + AND och.cl_this_money> 0 <if test = "clientName != null and clientName !=''"> AND cli.name like CONCAT('%',#{clientName},'%') </if> @@ -1100,6 +1101,7 @@ INNER JOIN pr_intake inta ON inta.id = och.intake_id <where> AND och.cl_ic_card_no IS NOT NULL AND och.client_id IS NOT NULL + AND och.cl_this_money> 0 <if test = "clientName != null and clientName !=''"> AND cli.name like CONCAT('%',#{clientName},'%') </if> -- Gitblit v1.8.0