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
5e817da3
Commit
5e817da3
authored
Apr 14, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
f8a67011
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
1 deletion
+13
-1
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+13
-1
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
5e817da3
...
...
@@ -24,6 +24,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.stream.Collectors
;
...
...
@@ -236,6 +237,17 @@ public class ExhibitionBoardController extends BaseController {
exhibitionBoard
.
setExhibitionBoardCatName
(
exhibitionBoardCat
.
getName
());
}
}
if
(
exhibitionBoard
.
getVideoContentId
()
!=
null
)
{
String
videoContentId
=
exhibitionBoard
.
getVideoContentId
();
final
VideoContent
videoContent
=
this
.
videoContentService
.
getById
(
videoContentId
);
if
(
videoContent
==
null
)
{
exhibitionBoard
.
setVideoList
(
Collections
.
emptyList
());
}
else
{
exhibitionBoard
.
setVideoContentName
(
videoContent
.
getName
());
final
List
<
Asset
>
videoList
=
this
.
assetService
.
list
(
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
videoContentId
));
exhibitionBoard
.
setVideoList
(
videoList
);
}
}
}
return
getResult
(
exhibitionBoardList
);
}
...
...
@@ -321,7 +333,7 @@ public class ExhibitionBoardController extends BaseController {
exhibitionBoard
.
setVideoContentName
(
"对应的视频内容已被删除"
);
}
else
{
exhibitionBoard
.
setVideoContentName
(
videoContent
.
getName
());
final
List
<
Asset
>
videoList
=
this
.
assetService
.
list
(
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
videoContentId
)
.
eq
(
Asset:
:
getFileCat
,
FileCatEnum
.
VIDEO_CONTENT
.
name
())
);
final
List
<
Asset
>
videoList
=
this
.
assetService
.
list
(
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
videoContentId
));
exhibitionBoard
.
setVideoList
(
videoList
);
}
}
...
...
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