|
|
@@ -126,7 +126,7 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
|
|
|
checkTagCodeDuplicate(aitagTagInfo.getTagCode());
|
|
|
if(!StringUtils.isBlank(parentId)){
|
|
|
LambdaQueryWrapper<AitagTagInfoEntity> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.eq(AitagTagInfoEntity::getParentId,parentId);
|
|
|
+ queryWrapper.eq(AitagTagInfoEntity::getId,parentId);
|
|
|
queryWrapper.eq(AitagTagInfoEntity::getIsDelete,TAG_UNDELETED);
|
|
|
List<AitagTagInfoEntity> aitagTagInfoEntities = this.baseMapper.selectList(queryWrapper);
|
|
|
if(!aitagTagInfoEntities.isEmpty()){
|
|
|
@@ -200,7 +200,7 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
|
|
|
aitagTagInfoEntity.setTagVersion(Integer.parseInt(oldTagInfo.getTagVersion())+1+"");
|
|
|
if(!StringUtils.isBlank(aitagTagInfoEntity.getParentId())){
|
|
|
AitagTagInfoEntity parentTagInfo = this.baseMapper.selectById(aitagTagInfoEntity.getParentId());
|
|
|
- if(parentTagInfo !=null){
|
|
|
+ if(parentTagInfo !=null && TAG_UNDELETED.equals(parentTagInfo.getIsDelete())){
|
|
|
aitagTagInfoEntity.setTagPath(parentTagInfo.getTagPath()+"/"+aitagTagInfoEntity.getTagNm());
|
|
|
aitagTagInfoEntity.setTagLevel(parentTagInfo.getTagLevel()+1);
|
|
|
if(aitagTagInfoEntity.getTagLevel() > 4){
|