bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/CopyrightOwnerController.java

@@ -5,14 +5,8 @@ import cn.wisenergy.chnmuseum.party.common.util.TimeUtils;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
-import cn.wisenergy.chnmuseum.party.model.CopyrightOwner;
-import cn.wisenergy.chnmuseum.party.model.CopyrightOwnerVideoContentCat;
-import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
-import cn.wisenergy.chnmuseum.party.model.VideoContentCat;
-import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
-import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerVideoContentCatService;
-import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
-import cn.wisenergy.chnmuseum.party.service.VideoContentCatService;
+import cn.wisenergy.chnmuseum.party.model.*;
+import cn.wisenergy.chnmuseum.party.service.*;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -55,6 +49,9 @@ public class CopyrightOwnerController extends BaseController {
     @Resource
     private VideoContentCatService videoContentCatService;
 
+    @Resource
+    private VideoContentService videoContentService;
+
     @Resource
     private CopyrightOwnerVideoContentCatService copyrightOwnerVideoContentCatService;
 
@@ -224,6 +221,15 @@ public class CopyrightOwnerController extends BaseController {
     })
     public Map<String, Object> deleteCopyrightOwner(@PathVariable("id") String id) {
         this.copyrightOwnerService.removeById(id);
+
+        final LambdaUpdateWrapper<VideoContent> updateWrapper = Wrappers.<VideoContent>lambdaUpdate().eq(VideoContent::getVideoContentCopyrightOwnerId, id);
+        updateWrapper.set(VideoContent::getDeleted, true);
+        this.videoContentService.update(updateWrapper);
+
+        final LambdaUpdateWrapper<ExhibitionBoard> updateWrapper1 = Wrappers.<ExhibitionBoard>lambdaUpdate().eq(ExhibitionBoard::getBoardCopyrightOwnerId, id);
+        updateWrapper1.set(ExhibitionBoard::getDeleted, true);
+        this.exhibitionBoardService.update(updateWrapper1);
+
         return getSuccessResult();
     }
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java

@@ -7,12 +7,12 @@ import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.model.CopyrightOwner;
 import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
 import cn.wisenergy.chnmuseum.party.model.ExhibitionBoardCat;
-import cn.wisenergy.chnmuseum.party.model.VideoContentCat;
 import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
 import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardCatService;
 import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -106,6 +106,11 @@ public class ExhibitionBoardCatController extends BaseController {
     })
     public Map<String, Object> deleteExhibitionBoardCat(@PathVariable("id") String id) {
         this.exhibitionBoardCatService.removeById(id);
+
+        final LambdaUpdateWrapper<ExhibitionBoard> updateWrapper = Wrappers.<ExhibitionBoard>lambdaUpdate().eq(ExhibitionBoard::getExhibitionBoardCatId, id);
+        updateWrapper.set(ExhibitionBoard::getDeleted, true);
+        this.exhibitionBoardService.update(updateWrapper);
+
         return getSuccessResult();
     }
 

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

@@ -196,8 +196,8 @@ public class ExhibitionBoardController extends BaseController {
             @ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
     })
     public Map<String, Object> getExhibitionBoardList(
-            @RequestParam(value = "exhibitionBoardCatIdList[]", required = false) List<String> exhibitionBoardCatIdList,
-            @RequestParam(value = "boardCopyrightOwnerIdList[]", required = false) List<String> boardCopyrightOwnerIdList) {
+            @RequestParam(value = "exhibitionBoardCatIdList", required = false) List<String> exhibitionBoardCatIdList,
+            @RequestParam(value = "boardCopyrightOwnerIdList", required = false) List<String> boardCopyrightOwnerIdList) {
         final LambdaQueryWrapper<ExhibitionBoard> lambdaQueryWrapper = Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getAuditStatus, "APPROVED_FINAL").eq(ExhibitionBoard::getPublished, true);
         if (exhibitionBoardCatIdList != null && !exhibitionBoardCatIdList.isEmpty()) {
             lambdaQueryWrapper.in(ExhibitionBoard::getExhibitionBoardCatId, exhibitionBoardCatIdList);
@@ -274,21 +274,33 @@ public class ExhibitionBoardController extends BaseController {
         Page<ExhibitionBoard> page = this.exhibitionBoardService.page(getPage(), queryWrapper);
         for (ExhibitionBoard exhibitionBoard : page.getRecords()) {
             if (exhibitionBoard.getBoardCopyrightOwnerId() != null) {
-                String name = this.copyrightOwnerService.getById(exhibitionBoard.getBoardCopyrightOwnerId()).getName();
-                exhibitionBoard.setBoardCopyrightOwnerName(name);
+                final CopyrightOwner copyrightOwner = this.copyrightOwnerService.getById(exhibitionBoard.getBoardCopyrightOwnerId());
+                if (copyrightOwner == null) {
+                    exhibitionBoard.setBoardCopyrightOwnerName("对应的展板版权方已被删除");
+                } else {
+                    exhibitionBoard.setBoardCopyrightOwnerName(copyrightOwner.getName());
+                }
             }
             if (exhibitionBoard.getVideoContentCopyrightOwnerId() != null) {
-                String name = this.copyrightOwnerService.getById(exhibitionBoard.getVideoContentCopyrightOwnerId()).getName();
-                exhibitionBoard.setVideoContentCopyrightOwnerName(name);
+                final CopyrightOwner copyrightOwner = this.copyrightOwnerService.getById(exhibitionBoard.getVideoContentCopyrightOwnerId());
+                if (copyrightOwner == null) {
+                    exhibitionBoard.setVideoContentCopyrightOwnerName("对应的视频内容版权方已被删除");
+                } else {
+                    exhibitionBoard.setVideoContentCopyrightOwnerName(copyrightOwner.getName());
+                }
             }
             if (exhibitionBoard.getExhibitionBoardCatId() != null) {
-                String name = this.exhibitionBoardCatService.getById(exhibitionBoard.getExhibitionBoardCatId()).getName();
-                exhibitionBoard.setExhibitionBoardCatName(name);
+                final ExhibitionBoardCat exhibitionBoardCat = this.exhibitionBoardCatService.getById(exhibitionBoard.getExhibitionBoardCatId());
+                if (exhibitionBoardCat == null) {
+                    exhibitionBoard.setExhibitionBoardCatName("对应的展板分类已被删除");
+                } else {
+                    exhibitionBoard.setExhibitionBoardCatName(exhibitionBoardCat.getName());
+                }
             }
             if (exhibitionBoard.getVideoContentId() != null) {
                 final VideoContent videoContent = this.videoContentService.getById(exhibitionBoard.getVideoContentId());
                 if (videoContent == null) {
-                    exhibitionBoard.setVideoContentName("该视频内容已被删除");
+                    exhibitionBoard.setVideoContentName("对应的视频内容已被删除");
                 } else {
                     exhibitionBoard.setVideoContentName(videoContent.getName());
                 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentCatController.java

@@ -10,6 +10,7 @@ import cn.wisenergy.chnmuseum.party.service.VideoContentCatService;
 import cn.wisenergy.chnmuseum.party.service.VideoContentService;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -147,6 +148,11 @@ public class VideoContentCatController extends BaseController {
     })
     public Map<String, Object> deleteVideoContentCat(@PathVariable("id") String id) {
         this.videoContentCatService.removeById(id);
+
+        final LambdaUpdateWrapper<VideoContent> updateWrapper = Wrappers.<VideoContent>lambdaUpdate().eq(VideoContent::getVideoContentCatId, id);
+        updateWrapper.set(VideoContent::getDeleted, true);
+        this.videoContentService.update(updateWrapper);
+
         return getSuccessResult();
     }