|
@ -163,6 +163,12 @@ public class TagDataController { |
|
|
Integer saveType = param.getSaveType(); |
|
|
Integer saveType = param.getSaveType(); |
|
|
List<TagInfo> tagInfoList = new ArrayList<>(); |
|
|
List<TagInfo> tagInfoList = new ArrayList<>(); |
|
|
if(CollUtil.isNotEmpty(param.getTagIds())){ |
|
|
if(CollUtil.isNotEmpty(param.getTagIds())){ |
|
|
|
|
|
long count = tagInfoService.count(new LambdaQueryWrapper<TagInfo>() |
|
|
|
|
|
.eq(TagInfo::getBusinessFlag,1) |
|
|
|
|
|
.in(TagInfo::getId,param.getTagIds())); |
|
|
|
|
|
if(count>0){ |
|
|
|
|
|
return R.error("业务标签不支持绑定"); |
|
|
|
|
|
} |
|
|
tagInfoList = tagInfoService.listByIds(param.getTagIds()); |
|
|
tagInfoList = tagInfoService.listByIds(param.getTagIds()); |
|
|
} |
|
|
} |
|
|
for (TargetObjectDTO objectDTO : param.getTargetList()) { |
|
|
for (TargetObjectDTO objectDTO : param.getTargetList()) { |
|
@ -234,6 +240,12 @@ public class TagDataController { |
|
|
LambdaQueryWrapper<TagData> lqw = new LambdaQueryWrapper<>(); |
|
|
LambdaQueryWrapper<TagData> lqw = new LambdaQueryWrapper<>(); |
|
|
lqw.eq(TagData::getTargetId,objectDTO.getTargetId()); |
|
|
lqw.eq(TagData::getTargetId,objectDTO.getTargetId()); |
|
|
lqw.eq(TagData::getTargetType,objectDTO.getTargetType()); |
|
|
lqw.eq(TagData::getTargetType,objectDTO.getTargetType()); |
|
|
|
|
|
//移除历史记录时,加载所有业务标签,并排除在外
|
|
|
|
|
|
List<TagInfo> tagInfos = tagInfoService.list(new LambdaQueryWrapper<TagInfo>() |
|
|
|
|
|
.eq(TagInfo::getBusinessFlag,1)); |
|
|
|
|
|
List<Long> businessTagIds = tagInfos.stream().map(TagInfo::getId).collect(Collectors.toList()); |
|
|
|
|
|
businessTagIds.add(-999L); |
|
|
|
|
|
lqw.notIn(TagData::getTagId,businessTagIds); |
|
|
tagDataService.remove(lqw); |
|
|
tagDataService.remove(lqw); |
|
|
for (TagInfo tagInfo : tagInfoList) { |
|
|
for (TagInfo tagInfo : tagInfoList) { |
|
|
TagData data = new TagData(); |
|
|
TagData data = new TagData(); |
|
|