Merge remote-tracking branch 'origin/dev' into dev

工程管理 bom信息
修改bom列表查询service接口，添加限制条件审核通过；

ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java

@@ -176,6 +176,8 @@ private ISysAttachService attachService;
     @Override
     public List<ErpBom> selectErpBomAllLevelList(ErpBom erpBom) {
         List<ErpBom> resultList = new ArrayList<>();
+        erpBom.setAuditStatus("1");
+        erpBom.setUseStatus("1");
         // 一阶集合
         List<ErpBom> oneLevelList = erpBomMapper.selectErpBomSubList(erpBom);
         if(CollectionUtils.isNotEmpty(oneLevelList)){
@@ -196,6 +198,8 @@ private ISysAttachService attachService;
             Long subId = subBom.getId();
             ErpBom erpBom1 = new ErpBom();
             erpBom1.setParentId(subId);
+            erpBom1.setAuditStatus("1");
+            erpBom1.setUseStatus("1");
             List<ErpBom> subLevelList = erpBomMapper.selectErpBomSubList(erpBom1);
             if(CollectionUtils.isNotEmpty(subLevelList)){
                 for (ErpBom sub: subLevelList) {