From 3f00a9c7853c2c3f53c69c3bb4b689b60184dfc4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 22:07:02 +0800
Subject: [PATCH] 1、VO、PO等值对象中凡时Double或Float类型的属性,都加上注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ); 2、工作报中数据查询SQL中增加clientAddr农户地址字段。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml
index f660158..60bfee9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml
@@ -212,10 +212,10 @@
     from ope_feedback ofb
     left join se_client sc on ofb.feedbacker_id = sc.id
     <where>
-      <if test="feedbackerId != null">
+      <if test="feedbackerId != null and feedbackerId != '' ">
         and ofb.feedbacker_id = #{feedbackerId,jdbcType=BIGINT}
       </if>
-      <if test="feedbackerName != null">
+      <if test="feedbackerName != null and feedbackerName != '' ">
         and sc.name = #{feedbackerName,jdbcType=VARCHAR}
       </if>
       <if test="timeStart != null">

--
Gitblit v1.8.0