From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 29 十月 2024 09:39:48 +0800 Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码; 2、删除global模块中一些无用的备份; 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false),防止编译时警告 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml index 7275f77..0c43003 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml @@ -184,10 +184,10 @@ from rm_client_amount_day rcad Left join se_client sc on sc.id = rcad.client_id <where> - <if test="clientName != null"> + <if test="clientName != null and clientName != '' "> and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%') </if> - <if test="clientId != null"> + <if test="clientId != null and clientId != ''"> and rcad.client_id = #{clientId} </if> <if test="startDt != null"> @@ -215,10 +215,10 @@ from rm_client_amount_day rcad Left join se_client sc on sc.id = rcad.client_id <where> - <if test="clientName != null"> + <if test="clientName != null and clientName != '' "> and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%') </if> - <if test="clientId != null"> + <if test="clientId != null and clientId != ''"> and rcad.client_id = #{clientId} </if> <if test="startDt != null"> -- Gitblit v1.8.0