From e8a75a44bdc130e8b162351c3c94c01f3d8ada5e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 10 八月 2023 17:58:00 +0800
Subject: [PATCH] 入库+发货

---
 inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 6cd8f94..ab3d5c2 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -18,13 +18,13 @@
         DATE_FORMAT(deal_time, '%Y-%m-%d') '澶勭悊鏃ユ湡'
         from mom_ocean.raw_inspect ri inner join mom_ocean.inspect_unaccepted ru on ri.id = ru.raw_inspect_id
         <where>
-        <if test="dealState!=null">
+        <if test="dealState!=null and dealState!=''">
            and deal_state=#{dealState}
         </if>
-        <if test="formTime!=null">
+        <if test="formTime!=null and formTime!=''">
             and form_time=#{formTime}
         </if>
-        <if test="type!=null">
+        <if test="type!=null and type!=''">
             and ru.type=#{type}
         </if>
         and ru.state=1
@@ -49,13 +49,13 @@
         mom_ocean.user u
         where fi.id = ru.raw_inspect_id
         and fi.user_id=u.id
-        <if test="dealState!=null">
+        <if test="dealState!=null and dealState!=''">
             and deal_state=#{dealState}
         </if>
-        <if test="formTime!=null">
+        <if test="formTime!=null and formTime!=''">
             and fi.create_time=#{formTime}
         </if>
-        <if test="type!=null">
+        <if test="type!=null and type!=''">
             and ru.type=#{type}
         </if>
         and ru.state=1

--
Gitblit v1.9.3