作者：张哲

时间：2023/02/28
类型：优化
描述：里程碑(2)知识专辑:处理知识被删的情况

src/main/java/com/redxun/knowledge/album/mapper/AlbumCatalogueKnowledgeMapper.java

@@ -25,4 +25,11 @@ public interface AlbumCatalogueKnowledgeMapper extends BaseDao<AlbumCatalogueKno
      * @param v
      */
     void deleteByCatalogueIds(@Param("catalogueId") String k, @Param("knowledgeIdList") List<String> v);
+
+    /**
+     * 根据目录Id查询目录下全部知识
+     * @param catalogueId
+     * @return
+     */
+    List<AlbumCatalogueKnowledge> findAllAlbumCatalogueKnowledgeList(@Param("catalogueId") String catalogueId);
 }

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

@@ -83,8 +83,7 @@ public class AlbumCatalogueServiceImpl extends SuperServiceImpl<AlbumCatalogueMa
             albumCatalogueVoList.forEach(albumCatalogueVo -> {
                 //查询对应的知识Id
                 List<AlbumCatalogueKnowledge> albumCatalogueKnowledgeList = albumCatalogueKnowledgeMapper.
-                        selectList(new LambdaQueryWrapper<AlbumCatalogueKnowledge>().
-                                eq(AlbumCatalogueKnowledge::getCatalogueId, albumCatalogueVo.getPkId()));
+                        findAllAlbumCatalogueKnowledgeList(albumCatalogueVo.getPkId());
                 //查询对应的知识
                 List<AlbumKnowledgeVo> albumKnowledgeVoList = albumCatalogueKnowledgeList.parallelStream().map(albumCatalogueKnowledge -> {
                     AlbumKnowledgeVo albumKnowledgeVo = new AlbumKnowledgeVo();

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

@@ -126,8 +126,7 @@ public class AlbumVersionServiceImpl extends SuperServiceImpl<AlbumVersionMapper
         albumCataloguePcVos.forEach(albumCatalogueVo -> {
             //查询对应的知识Id
             List<AlbumCatalogueKnowledge> albumCatalogueKnowledgeList = albumCatalogueKnowledgeMapper.
-                    selectList(new LambdaQueryWrapper<AlbumCatalogueKnowledge>().
-                            eq(AlbumCatalogueKnowledge::getCatalogueId, albumCatalogueVo.getPkId()));
+                    findAllAlbumCatalogueKnowledgeList(albumCatalogueVo.getPkId());
             //查询对应的知识
             List<AlbumKnowledgeVo> albumKnowledgeVoList = albumCatalogueKnowledgeList.parallelStream().map(albumCatalogueKnowledge -> {
                 AlbumKnowledgeVo albumKnowledgeVo = new AlbumKnowledgeVo();

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

@@ -86,8 +86,7 @@ public class AlbumYelpApproveServiceImpl extends SuperServiceImpl<AlbumYelpAppro
         String type = (String) queryFilter.getParams().get("type");
         //获取全部数据
         List<AlbumYelpApprove> albumYelpApproveList = albumYelpApproveMapper.findAllAlbumYelpApprove(queryFilter.getParams(), params);
-        //List<AlbumYelpApprove> albumYelpApproveList = page.getRecords();
-        //根据专辑Id进行数据分组
+        //根据点评(回复)Id进行数据分组
         Map<String, List<AlbumYelpApprove>> albumApproveMap = albumYelpApproveList.stream().
                 collect(Collectors.groupingBy(AlbumYelpApprove::getYelpId));
         // 返回结果集
@@ -117,7 +116,6 @@ public class AlbumYelpApproveServiceImpl extends SuperServiceImpl<AlbumYelpAppro
                 //用于权限判断
                 albumApproveListVo.setApproverId(value.get(i).getApproverId());
                 albumApproveListVo.setApprovalState(value.get(i).getAlbumYelp().getApprovalState());
-                // albumApproveListVo.setApprovalId(value.get(i).getPkId());
                 //动作标记
                 String userId = userService.queryLoginUser();
                 String deptId = userService.queryLoginUserDeptId();

src/main/resources/mapper/knowledge/album/AlbumCatalogueKnowledgeMapper.xml

@@ -50,6 +50,14 @@
         </foreach>
     </delete>
 
+    <select id="findAllAlbumCatalogueKnowledgeList" resultType="com.redxun.knowledge.album.entity.dao.AlbumCatalogueKnowledge">
+        select ack.*
+        from KM_ALBUM_CATALOGUE_KNOWLEDGE ack
+        join KM_KNOWLEDGE kk
+        on ack.KNOWLEDGE_ID = kk.PK_ID and kk.IS_DEL = 0
+        where ack.IS_DEL = 0 and ack.CATALOGUE_ID = #{catalogueId}
+    </select>
+
 </mapper>