作者：张哲

时间：2023/08/02
类型：变更
描述：专辑审核列表和点评审核列表修改

src/main/java/com/redxun/knowledge/album/service/AlbumApproveServiceImpl.java

@@ -21,6 +21,7 @@ import com.redxun.knowledge.album.entity.vo.AlbumYelpApproveListVo;
 import com.redxun.knowledge.album.mapper.*;
 import com.redxun.knowledge.common.UserService;
 import com.redxun.knowledge.entity.dao.KnowledgeApprove;
+import com.redxun.knowledge.mapper.KnowledgeApproveMapper;
 import com.redxun.knowledge.utils.PageListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,9 @@ public class AlbumApproveServiceImpl extends SuperServiceImpl<AlbumApproveMapper
     @Autowired
     private AlbumApproveServiceImpl albumApproveService;
 
+    @Autowired
+    private KnowledgeApproveMapper knowledgeApproveMapper;
+
     @Override
     public BaseDao<AlbumApprove> getRepository() {
         return albumApproveMapper;
@@ -187,7 +191,11 @@ public class AlbumApproveServiceImpl extends SuperServiceImpl<AlbumApproveMapper
                 }
             }
         }
-        if ("1".equals(type)) {
+        //判断是否查看审核列表和知识管理员 是 查询全部数据 不是 只查看自己能审核的数据
+        //查询知识管理员
+        List<String> knowledgeManager = knowledgeApproveMapper.findKnowledgeManager();
+        String user = userService.queryLoginUser();
+        if (("1".equals(type) && knowledgeManager.contains(user)) || "1".equals(user)) {
             List<AlbumApprove> result = albumApproveVos.stream().
                     sorted((t1, t2) -> t2.getCreateTime().compareTo(t1.getCreateTime())).collect(Collectors.toList());
             Page pageResult = PageListUtils.getPages(queryFilter.getPage().getCurrent(), queryFilter.getPage().getSize(), result);

src/main/java/com/redxun/knowledge/album/service/AlbumYelpApproveServiceImpl.java

@@ -23,6 +23,7 @@ import com.redxun.knowledge.album.entity.vo.AlbumYelpApproveListVo;
 import com.redxun.knowledge.album.mapper.*;
 import com.redxun.knowledge.common.MessageService;
 import com.redxun.knowledge.common.UserService;
+import com.redxun.knowledge.mapper.KnowledgeApproveMapper;
 import com.redxun.knowledge.qywexin.QYWechatUtils;
 import com.redxun.knowledge.utils.PageListUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -64,6 +65,9 @@ public class AlbumYelpApproveServiceImpl extends SuperServiceImpl<AlbumYelpAppro
     @Autowired
     private MessageService messageService;
 
+    @Autowired
+    private KnowledgeApproveMapper knowledgeApproveMapper;
+
     @Override
     public BaseDao<AlbumYelpApprove> getRepository() {
         return albumYelpApproveMapper;
@@ -110,7 +114,11 @@ public class AlbumYelpApproveServiceImpl extends SuperServiceImpl<AlbumYelpAppro
                 }
             }
         }
-        if ("1".equals(type)) {
+        //判断是否查看审核列表和知识管理员 是 查询全部数据 不是 只查看自己能审核的数据
+        //查询知识管理员
+        List<String> knowledgeManager = knowledgeApproveMapper.findKnowledgeManager();
+        String user = userService.queryLoginUser();
+        if (("1".equals(type) && knowledgeManager.contains(user)) || "1".equals(user)) {
             List<AlbumYelpApprove> result = albumYelpApproves.stream().
                     sorted((t1, t2) -> t2.getCreateTime().compareTo(t1.getCreateTime())).collect(Collectors.toList());
             Page pageResult = PageListUtils.getPages(queryFilter.getPage().getCurrent(), queryFilter.getPage().getSize(), result);