|
|
@ -620,7 +620,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
|
if (AGENCY.equals(staffLevel)) { |
|
|
|
resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList()); |
|
|
|
} else { |
|
|
|
resultList = baseDao.selectArticleListForGrid(tokenDto.getCustomerId(), formDTO.getTagIdList(), userInfo.getGridIdList()); |
|
|
|
Set<String> gridList = new HashSet<>(); |
|
|
|
if (null != userInfo.getGridIdList()) { |
|
|
|
gridList = userInfo.getGridIdList(); |
|
|
|
} |
|
|
|
resultList = baseDao.selectArticleListForGrid(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList); |
|
|
|
} |
|
|
|
resultList.forEach(result -> { |
|
|
|
String tags = result.getTags(); |
|
|
|