From 1011bda85733a66a6ebb9b5674d459f945095f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 3 Jun 2024 15:34:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E4=BF=AE=E5=A4=8D=E7=B2=BE?=
 =?UTF-8?q?=E7=A1=AE=E6=90=9C=E7=B4=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java    |  8 ++++++--
 .../mapper/master/BomNewEbomParentMapper.xml       | 14 ++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 18aee016..de919938 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -2223,13 +2223,17 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             query.setPage(1L);
             query.setPageSize(20L);
         }
-        Page<BomNewEbomParentVO> result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage()
-                , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId());
+        Page<BomNewEbomParentVO> result;
         if (StrUtil.isBlank(query.getMaterialNo()) && StrUtil.isBlank(query.getDrawingNo())) {
+            result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage()
+                    , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId());
             //列表搜索
             materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
             return result;
         }
+        query.setShowMySelfOnly(0);
+        result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage()
+                , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId());
         //根据编号或图号搜索
         //从顶级开始查找
         List<BomNewEbomParentVO> roots = result.getRecords().stream()
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 68c9bc56..ebebadac 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
@@ -457,12 +457,14 @@
         , b.*
         FROM t_bom_new_ebom_child b
         LEFT JOIN t_bom_new_ebom_parent a ON a.material_no = b.material_no
-        <if test="materialNo!=null and materialNo!=''">
-            WHERE b.material_no = #{materialNo}
-        </if>
-        <if test="drawingNo!=null and drawingNo!=''">
-            WHERE b.drawingNo = #{drawingNo}
-        </if>
+        <where>
+            <if test="materialNo!=null and materialNo!=''">
+                AND b.material_no = #{materialNo}
+            </if>
+            <if test="drawingNo!=null and drawingNo!=''">
+                AND b.drawing_no = #{drawingNo}
+            </if>
+        </where>
         ORDER BY b.order_number
     </select>