diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java index ce5add3..8479efd 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java @@ -13,6 +13,7 @@ import net.srt.query.MetamodelpropertyQuery; import net.srt.service.MetamodelPropertyService; import net.srt.vo.MetamodelPropertyVO; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import srt.cloud.framework.dbswitch.common.util.StringUtil; import java.util.List; @@ -29,7 +30,8 @@ public class MetamodelPropertyServiceImpl extends BaseServiceImpl properties(Long id) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(MetamodelPropertyEntity::getMetamodelId, id).orderByAsc(MetamodelPropertyEntity::getOrderNo); + wrapper.eq(MetamodelPropertyEntity::getMetamodelId, id) + .orderByAsc(MetamodelPropertyEntity::getOrderNo); return MetamodelPropertyConvert.INSTANCE.convertList(baseMapper.selectList(wrapper)); } @@ -55,8 +57,8 @@ public class MetamodelPropertyServiceImpl extends BaseServiceImpl getWrapper(MetamodelpropertyQuery query) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(MetamodelPropertyEntity::getMetamodelId, query.getMetamodelId()) - .like(StringUtil.isBlank(query.getName()), MetamodelPropertyEntity::getName, query.getName()) - .like(StringUtil.isBlank(query.getCode()), MetamodelPropertyEntity::getCode, query.getCode()) + .like(StringUtil.isNotBlank(query.getName()), MetamodelPropertyEntity::getName, query.getName()) + .like(StringUtil.isNotBlank(query.getCode()), MetamodelPropertyEntity::getCode, query.getCode()) .orderByAsc(MetamodelPropertyEntity::getOrderNo); return wrapper; } @@ -80,13 +82,31 @@ public class MetamodelPropertyServiceImpl extends BaseServiceImpl idList) { - + removeByIds(idList); } + }