Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
e7b24128
Commit
e7b24128
authored
3 years ago
by
liqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
3c9e3d7a
master
1.0
dev
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
ExhibitionBoardCatController.java
...um/party/web/controller/ExhibitionBoardCatController.java
+3
-0
VideoContentCatController.java
...useum/party/web/controller/VideoContentCatController.java
+3
-0
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java
View file @
e7b24128
...
...
@@ -33,6 +33,7 @@ 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
;
...
...
@@ -155,6 +156,8 @@ public class ExhibitionBoardCatController extends BaseController {
if
(!
copyrightOwnerBoardCatList
.
isEmpty
())
{
final
List
<
String
>
collect
=
copyrightOwnerBoardCatList
.
stream
().
map
(
CopyrightOwnerBoardCat:
:
getBoardCatId
).
distinct
().
collect
(
Collectors
.
toList
());
exhibitionBoardCatLambdaQueryWrapper
.
in
(
ExhibitionBoardCat:
:
getId
,
collect
);
}
else
{
return
getResult
(
Collections
.
emptyList
());
}
}
List
<
ExhibitionBoardCat
>
exhibitionBoardCatList
=
exhibitionBoardCatService
.
list
(
exhibitionBoardCatLambdaQueryWrapper
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentCatController.java
View file @
e7b24128
...
...
@@ -26,6 +26,7 @@ import org.springframework.validation.annotation.Validated;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
...
...
@@ -105,6 +106,8 @@ public class VideoContentCatController extends BaseController {
if
(!
copyrightOwnerVideoContentCatList
.
isEmpty
())
{
final
List
<
String
>
collect
=
copyrightOwnerVideoContentCatList
.
stream
().
map
(
CopyrightOwnerVideoContentCat:
:
getVideoContentCatId
).
distinct
().
collect
(
Collectors
.
toList
());
videoContentCatLambdaQueryWrapper
.
in
(
VideoContentCat:
:
getId
,
collect
);
}
else
{
return
getResult
(
Collections
.
emptyList
());
}
}
List
<
VideoContentCat
>
videoContentCatList
=
videoContentCatService
.
list
(
videoContentCatLambdaQueryWrapper
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment