diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 63dc0acd..cb18e184 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -386,15 +386,7 @@ public class ActSarItemsBussEOService { // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarBussionessStand.setSarStandAttrEOStr(resData); - // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId - QueryWrapperqueryWrapper = new QueryWrapper<>(); - queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) - .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); - Integer count = iSarBussionessStandService.count(queryWrapper); - if (count > 0){ - throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); - } String standCode = ""; if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ standCode = sarBussionessStand.getStandCode(); @@ -472,6 +464,14 @@ public class ActSarItemsBussEOService { } else {//标准号、ID都不存在的情况 // 新增方法 sarBussionessStand.setPrcCreateUser(prcCreateUser); + // 根据标准号判断数据是否已存在 + QueryWrapperqueryWrapper = new QueryWrapper<>(); + queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) + .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); + Integer count = iSarBussionessStandService.count(queryWrapper); + if (count > 0){ + throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); + } ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); if(responseMessage.isOk()){ SarBussionessStand bussionessStand = responseMessage.getData();