diff --git a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java index 6e50f49..0993359 100644 --- a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java +++ b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java @@ -184,18 +184,9 @@ public class CalcTargetConfigServiceImpl */ private void generateDefaultInfo(CalcTargetConfigDTO targetConfig) { boolean flag = ObjectUtil.isEmpty(targetConfig.getId()); - if(!flag){ - QueryWrapper eq = QueryWrapper.create().eq(CalcTargetConfigEntity::getTargetThingCode, targetConfig.getTargetThingCode()) - .eq(CalcTargetConfigEntity::getTargetAttrCode, targetConfig.getTargetAttrCode()) - .eq(CalcTargetConfigEntity::getTenantCode, UserContext.getRealTenantCode()); - CalcTargetConfigEntity calcTargetConfigEntity = mapper.selectOneByQuery(eq); - if(!Objects.isNull(calcTargetConfigEntity)){ - //calcSourceConfigService.findByTargetId(calcTargetConfigEntity.getId()); - throw new SysException(targetConfig.getTargetThingCode()+"-"+targetConfig.getTargetAttrCode()+"目标物配置已存在!不要重复配置"); - } - }else{ - QueryWrapper eq = QueryWrapper.create().eq(CalcTargetConfigEntity::getTargetThingCode, targetConfig.getTargetThingCode()) - .eq(CalcTargetConfigEntity::getId, targetConfig.getId()) + if(ObjectUtil.isEmpty(targetConfig.getId())){ + QueryWrapper eq = QueryWrapper.create() + .eq(CalcTargetConfigEntity::getTargetThingCode, targetConfig.getTargetThingCode()) .eq(CalcTargetConfigEntity::getTargetAttrCode, targetConfig.getTargetAttrCode()) .eq(CalcTargetConfigEntity::getTenantCode, UserContext.getRealTenantCode()); CalcTargetConfigEntity calcTargetConfigEntity = mapper.selectOneByQuery(eq);