[fix]

工程管理 物料信息、bom信息
修改当前状态赋值前获取审核状态的判断

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

@@ -152,10 +152,12 @@ private ISysAttachService attachService;
             } else {
                 bomVo.setTaskName("未启动");
             }
-            if(bomVo.getAuditStatus().equals("1")){
-                bomVo.setTaskName("审核通过");
-            }else if(bomVo.getAuditStatus().equals("2")){
-                bomVo.setTaskName("审核拒绝");
+            if(bomVo.getAuditStatus()!=null){
+                if(bomVo.getAuditStatus().equals("1")){
+                    bomVo.setTaskName("审核通过");
+                }else if(bomVo.getAuditStatus().equals("2")){
+                    bomVo.setTaskName("审核拒绝");
+                }
             }
             returnList.add(bomVo);
         }
@@ -454,6 +456,7 @@ private ISysAttachService attachService;
         List<ErpBomVo> zeroLevelList = erpBomMapper.selectErpBomList(erpBom);
         if(CollectionUtils.isNotEmpty(zeroLevelList)){
             for (ErpBomVo bom:zeroLevelList) {
+                bom.setLevelType(bom.getLevel().toString());
                 resultList.add(bom);
                 ErpBom bom1 = new ErpBom();
                 bom1.setParentId(bom.getId());
@@ -471,6 +474,7 @@ private ISysAttachService attachService;
         if(CollectionUtils.isNotEmpty(zeroLevelList)){
             for (ErpBomVo bom:zeroLevelList) {
                 bom.setParentId(0L);
+                bom.setLevelType(bom.getLevel().toString());
                 resultList.add(bom);
                 ErpBom bom1 = new ErpBom();
                 bom1.setParentId(bom.getId());

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

@@ -141,10 +141,12 @@ public class ErpMaterialServiceImpl implements IErpMaterialService
             } else {
                 materialVo.setTaskName("未启动");
             }
-            if(materialVo.getAuditStatus().equals("1")){
-                materialVo.setTaskName("审核通过");
-            }else if(materialVo.getAuditStatus().equals("2")){
-                materialVo.setTaskName("审核拒绝");
+            if(materialVo.getAuditStatus()!=null){
+                if(materialVo.getAuditStatus().equals("1")){
+                    materialVo.setTaskName("审核通过");
+                }else if(materialVo.getAuditStatus().equals("2")){
+                    materialVo.setTaskName("审核拒绝");
+                }
             }
             returnList.add(materialVo);
         }