From 8a5c47a1f457f9fc4e6a1a6b36abd9b9e3c2c807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 7 May 2024 16:22:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AAsql?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/master/BomNewEbomParentMapper.xml  | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index e391f8da..eac96296 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -393,24 +393,26 @@
         SELECT *,row_id as bomRowId
         FROM t_bom_new_ebom_parent
         <!--        WHERE (root_is=1 OR ((user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode}))-->
-        <if test="query.showMySelfOnly == 1">
-            AND created_by = #{userCode}
-        </if>
-        <if test="userJob==0">
-            WHERE status IN (1,3) AND (user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode}
-        </if>
-        <if test="userJob==1 and query.dataType==0">
-            WHERE root_is=1 AND status=2
-        </if>
-        <if test="userJob==1 and query.dataType==1">
-            WHERE root_is=1 AND status=4
-        </if>
-        <if test="query.deviseName!=null and query.deviseName!=''">
-            AND devise_name=#{query.deviseName}
-        </if>
-        <if test="query.startDate!=null and query.startDate!=''">
-            AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
-        </if>
+        <where>
+            <if test="query.showMySelfOnly == 1">
+                AND created_by = #{userCode}
+            </if>
+            <if test="userJob==0">
+                AND status IN (1,3) AND (user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode}
+            </if>
+            <if test="userJob==1 and query.dataType==0">
+                AND root_is=1 AND status=2
+            </if>
+            <if test="userJob==1 and query.dataType==1">
+                AND root_is=1 AND status=4
+            </if>
+            <if test="query.deviseName!=null and query.deviseName!=''">
+                AND devise_name=#{query.deviseName}
+            </if>
+            <if test="query.startDate!=null and query.startDate!=''">
+                AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
+            </if>
+        </where>
         order by row_id desc
     </select>