|
@@ -118,7 +118,7 @@ public class AlbumYelpApproveServiceImpl extends SuperServiceImpl<AlbumYelpAppro
|
|
//查询知识管理员
|
|
//查询知识管理员
|
|
List<String> knowledgeManager = knowledgeApproveMapper.findKnowledgeManager();
|
|
List<String> knowledgeManager = knowledgeApproveMapper.findKnowledgeManager();
|
|
String user = userService.queryLoginUser();
|
|
String user = userService.queryLoginUser();
|
|
- if (("1".equals(type) && knowledgeManager.contains(user)) || "1".equals(user)) {
|
|
|
|
|
|
+ if ("1".equals(type) && knowledgeManager.contains(user)) {
|
|
List<AlbumYelpApprove> result = albumYelpApproves.stream().
|
|
List<AlbumYelpApprove> result = albumYelpApproves.stream().
|
|
sorted((t1, t2) -> t2.getCreateTime().compareTo(t1.getCreateTime())).collect(Collectors.toList());
|
|
sorted((t1, t2) -> t2.getCreateTime().compareTo(t1.getCreateTime())).collect(Collectors.toList());
|
|
Page pageResult = PageListUtils.getPages(queryFilter.getPage().getCurrent(), queryFilter.getPage().getSize(), result);
|
|
Page pageResult = PageListUtils.getPages(queryFilter.getPage().getCurrent(), queryFilter.getPage().getSize(), result);
|