From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001 From: zf <1603559716@qq.com> Date: 星期三, 30 八月 2023 09:05:45 +0800 Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf --- src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java b/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java index d1dc7fb..b7bd72b 100644 --- a/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java +++ b/src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetyInspectionItemImpl.java @@ -289,7 +289,7 @@ if (param.getElementB() == null) throw new BusinessException("请选择B级要素"); //如果有三级要素则不创建标准 List<ElementManagement> elementList = elementManagementService.getElementByParentId(param.getElementB()); - if(elementList.size() > 0){ + if(param.getElementC() == null && elementList.size() > 0){ throw new BusinessException("请先删除三级要素"); } if(StringUtils.isBlank(param.getStandardizationRequirements())) throw new BusinessException("请填写标准化要求"); -- Gitblit v1.9.2