Merge remote-tracking branch 'origin/master'

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

@@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -145,13 +144,10 @@ public class ExhibitionBoardCatController extends BaseController {
         if (copyrightOwnerIdList != null && !copyrightOwnerIdList.isEmpty()) {
             final LambdaQueryWrapper<CopyrightOwnerBoardCat> queryWrapper = Wrappers.<CopyrightOwnerBoardCat>lambdaQuery().in(CopyrightOwnerBoardCat::getCopyrightOwnerId, copyrightOwnerIdList);
             final List<CopyrightOwnerBoardCat> copyrightOwnerBoardCatList = this.copyrightOwnerBoardCatService.list(queryWrapper);
-            if (copyrightOwnerBoardCatList.isEmpty()) {
-                return getResult(Collections.EMPTY_LIST);
+            if (!copyrightOwnerBoardCatList.isEmpty()) {
+                final List<String> collect = copyrightOwnerBoardCatList.stream().map(CopyrightOwnerBoardCat::getBoardCatId).distinct().collect(Collectors.toList());
+                exhibitionBoardCatLambdaQueryWrapper.in(ExhibitionBoardCat::getId, collect);
             }
-            final List<String> collect = copyrightOwnerBoardCatList.stream().map(CopyrightOwnerBoardCat::getBoardCatId).distinct().collect(Collectors.toList());
-            exhibitionBoardCatLambdaQueryWrapper.in(ExhibitionBoardCat::getId, collect);
-            List<ExhibitionBoardCat> exhibitionBoardCatList = exhibitionBoardCatService.list(exhibitionBoardCatLambdaQueryWrapper);
-            return getResult(exhibitionBoardCatList);
         }
         List<ExhibitionBoardCat> exhibitionBoardCatList = exhibitionBoardCatService.list(exhibitionBoardCatLambdaQueryWrapper);
         return getResult(exhibitionBoardCatList);