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 workListPage(BomNewMbomParentQuery query) { query.setStatus(MBomConstantEnum.MBomStatusEnum.UNPUB_SAP.getValue()); - query.setFacCode(SpringUtil.getBean(UserRoleService.class).getUserFactory()); + List 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 formalListPage(BomNewMbomParentQuery query) { query.setStatus(MBomConstantEnum.MBomStatusEnum.PUB_SAP.getValue()); - query.setFacCode(SpringUtil.getBean(UserRoleService.class).getUserFactory()); + List 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} - and fac_code=#{query.facCode} + and fac_code in (${query.facCode}) @@ -146,7 +146,7 @@ and t2.status=#{query.status} - and t1.fac_code=#{query.facCode} + and t1.fac_code in (${query.facCode}) and t1.drawing_no like concat ('',#{query.drawingNo},'%')