From 16b46383169e65b1400e1aa2f7483dbd17e451ae Mon Sep 17 00:00:00 2001 From: jing's Date: Sun, 3 Dec 2023 21:41:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java | 2 +- .../product/bomnew/service/aggreg/OptionalExcelService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java index 1a51a8f2..e84559d5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java @@ -166,7 +166,7 @@ public class OptionalEbomApi extends BaseApi { return ResultVO.error("rootRowId不能为空"); } - if(dto.getPartType() == OptionalBomConstant.PartTypeEnum.PART_TYPE_CHECBOX.getValue() &&( dto.getParentRowId()==null || dto.getParentRowId()==0)){ + if(dto.getPartType() == OptionalBomConstant.PartTypeEnum.PART_TYPE_RADIO.getValue() &&( dto.getParentRowId()==null || dto.getParentRowId()==0)){ return ResultVO.error("标配件parentRowId不能为空"); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java index baafa113..02b61f06 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java @@ -197,7 +197,7 @@ public class OptionalExcelService { //检查是否满足条件 除了‘无’ ，物料号不能为空 String hintMsg=isValiData(optionalEbomInportExcelDTO.getOptionInfo()); - if(StrUtil.isEmpty(hintMsg)){ + if(!StrUtil.isEmpty(hintMsg)){ throw new NflgBusinessException(STATE.Error,hintMsg); }