限制下架展板

src/main/java/cn/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -501,14 +501,17 @@ public class ExhibitionBoardController extends BaseController {
             List<LearningContentBoard> list = this.learningContentBoardService.list(objectLambdaQueryWrapper);
             List<String> collect = list.stream().map(LearningContentBoard::getLearningContentId).collect(Collectors.toList());
             // 查询学习内容，判断是否已全部下架
-            LambdaQueryWrapper<LearningContent> learningContentLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            learningContentLambdaQueryWrapper.in(LearningContent::getId,collect);
-            List<LearningContent> list1 = this.learningContentService.list(learningContentLambdaQueryWrapper);
-            for (LearningContent learningContent : list1) {
-                if (learningContent.getPublished()) {
-                    return getFailResult("该展板所在学习内容未下架，展板不能被下架！");
+            if (CollectionUtil.isNotEmpty(collect)) {
+                LambdaQueryWrapper<LearningContent> learningContentLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                learningContentLambdaQueryWrapper.in(LearningContent::getId,collect);
+                List<LearningContent> list1 = this.learningContentService.list(learningContentLambdaQueryWrapper);
+                for (LearningContent learningContent : list1) {
+                    if (learningContent.getPublished()) {
+                        return getFailResult("该展板所在学习内容未下架，展板不能被下架！");
+                    }
                 }
             }
+
         }
 
         final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(id);

src/main/resources/mapper/TBoardStatisticMapper.xml

@@ -46,7 +46,7 @@
         left join t_organ o on o.id = s.organ_id
         LEFT JOIN exhibition_board b ON b.id=s.board_id
         <where>
-            b.is_deleted=0
+            1=1
             <if test="rank.playDate != null">
                 and s.play_date like concat( #{rank.playDate}, '%')
             </if>