diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java index 2358e6e4..32230950 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java @@ -10,6 +10,7 @@ import com.nflg.product.bomnew.constant.UserJobEnum; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.UserRoleService; +import com.nflg.product.bomnew.util.VUtils; import lombok.Getter; import org.apache.tomcat.jni.User; @@ -38,8 +39,13 @@ public class EBomDel { List roleList= SpringUtil.getBean(UserRoleService.class).getUserPost(); + if(CollUtil.isEmpty(bomTreeAll)){ + VUtils.isTure(true).throwMessage("查询无bom数据"); + } - + if(CollUtil.isEmpty(roleList)){ + VUtils.isTure(true).throwMessage("查询用户角色错误"); + } //设计人员: 自己创建的直接删除 //工艺岗位,只能删除自己在EBOM中创建的数据 @@ -70,6 +76,9 @@ public class EBomDel { .collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(revertOBom)) { + if(CollUtil.isEmpty(delEBom)){ + delEBom=new ArrayList<>(); + } delEBom.addAll(revertOBom); } // }