From 9ab8a44e06d8024d25113f0c269c10b38009b183 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Tue, 23 Jan 2024 15:25:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B7=A5=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewMbomParentService.java   | 8 ++++++--
 .../resources/mapper/master/BomNewMbomParentMapper.xml    | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
index d9d0fc62..869e4766 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
@@ -47,7 +47,9 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
     public Page<BomNewMbomMiddleVO> workListPage(BomNewMbomParentQuery query) {
 
         query.setStatus(MBomConstantEnum.MBomStatusEnum.UNPUB_SAP.getValue());
-        query.setFacCode(SpringUtil.getBean(UserRoleService.class).getUserFactory());
+         List<String>  facCode= SpringUtil.getBean(UserRoleService.class).getUserOfFactory();
+       String code= StrUtil.join(",",facCode);
+        query.setFacCode(code);
 
         return listPage(query);
     }
@@ -92,7 +94,9 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
 
     public Page<BomNewMbomMiddleVO> formalListPage(BomNewMbomParentQuery query) {
         query.setStatus(MBomConstantEnum.MBomStatusEnum.PUB_SAP.getValue());
-        query.setFacCode(SpringUtil.getBean(UserRoleService.class).getUserFactory());
+        List<String>  facCode= SpringUtil.getBean(UserRoleService.class).getUserOfFactory();
+        String code= StrUtil.join(",",facCode);
+        query.setFacCode(code);
         return listPage(query);
 
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
index f9a2c9e9..1189d328 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
@@ -60,7 +60,7 @@
             and material_no=#{query.materialNo}
         </if>
         <if test="query.facCode!=null and query.facCode!=''">
-            and fac_code=#{query.facCode}
+            and fac_code in (${query.facCode})
         </if>
 
       
@@ -146,7 +146,7 @@
             and t2.status=#{query.status}
         </if>
         <if test="query.facCode!=null and query.facCode!=''">
-            and t1.fac_code=#{query.facCode}
+            and t1.fac_code in (${query.facCode})
         </if>
         <if test="query.drawingNo!=null and query.drawingNo!=''">
             and t1.drawing_no like concat ('',#{query.drawingNo},'%')