|
|
@ -209,6 +209,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao |
|
|
|
result.setSpecialSubjectId(dto.getId()); |
|
|
|
//1、如果当前专题是给当前所在组织(or网格)添加的;
|
|
|
|
//2、当前工作人员所属的组织,与专题添加人所属的组织一致,同时满足这两个条件即可删除
|
|
|
|
// A组织添加到G1网格的专题,只有A组织下的工作人员,切换到G1时,才可以删除。
|
|
|
|
if(dto.getAddUserAgencyId().equals(staffResult.getData().getId()) |
|
|
|
&& dto.getAddOrgId().equals(formDTO.getOrgId())){ |
|
|
|
result.setCanDel(true); |
|
|
@ -269,9 +270,11 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao |
|
|
|
wrapper.eq(SpecialSubjectEntity :: getCustomerId, formDTO.getCustomerId()); |
|
|
|
wrapper.eq(SpecialSubjectEntity :: getDelFlag, NumConstant.ZERO_STR); |
|
|
|
wrapper.in(SpecialSubjectEntity :: getAddOrgId, orgIds); |
|
|
|
//查询出当前组织或网格已有的专题,
|
|
|
|
List<SpecialSubjectEntity> specialSubjectList = baseDao.selectList(wrapper); |
|
|
|
if (CollectionUtils.isNotEmpty(specialSubjectList)) { |
|
|
|
List<String> tags = specialSubjectList.stream().map(SpecialSubjectEntity :: getTagId).distinct().collect(Collectors.toList()); |
|
|
|
// 排除
|
|
|
|
list = list.stream().filter(item -> !tags.contains(item.getTagId())).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
return list; |
|
|
@ -291,9 +294,6 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao |
|
|
|
if (CollectionUtils.isNotEmpty(formDTO.getTagIdList())) { |
|
|
|
formDTO.getTagIdList().forEach(tagId -> { |
|
|
|
PreviewResultDTO previewResultDTO = new PreviewResultDTO(); |
|
|
|
// SpecialSubjectDTO subject = baseDao.getInfo(tagId);
|
|
|
|
// previewResultDTO.setSpecialSubjectId(subject.getId());
|
|
|
|
// previewResultDTO.setTagName(subject.getTagName());
|
|
|
|
previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(), |
|
|
|
formDTO.getPageSize())); |
|
|
|
result.add(previewResultDTO); |
|
|
|