From 814ad0fde457ac171b35fd4804419501f8628b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 28 Oct 2024 11:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=9F=A5=E8=AF=A2sq?=
 =?UTF-8?q?l=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/stockOperate/DlRepairSoMapper.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
index 06abc89b..3f1476ad 100644
--- a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
@@ -43,6 +43,7 @@
                so.so_status,
                so.remark,
                so.corp_id,
+               so.main_id,
                so.corp_name,
                so.dept_id,
                so.create_time,
@@ -67,7 +68,7 @@
             and so.so_status = #{map.soStatus}
         </if>
         <if test="map.soStatus == null">
-            and so.so_status != '06'
+            and (so.so_status != '06' or so.so_status is null)
         </if>
         <if test="map.searchTimeArray != null and map.searchTimeArray.length > 0">
             and (so.create_time between #{map.searchTimeArray[0]} and #{map.searchTimeArray[1]})
@@ -84,6 +85,9 @@
         <if test="map.userId != null and map.userId != ''">
             and (so.user_id = #{map.userId})
         </if>
+        <if test="map.mainId != null and map.mainId != ''">
+            and so.main_id = #{map.mainId}
+        </if>
         order by so.create_time desc
     </select>
     <select id="selectCountNum" resultType="java.lang.Integer">