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
15cba528
Commit
15cba528
authored
Apr 06, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
f45ad58f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
LearningContentBoardMapper.java
...gy/chnmuseum/party/mapper/LearningContentBoardMapper.java
+3
-0
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+0
-2
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/mapper/LearningContentBoardMapper.java
View file @
15cba528
...
...
@@ -39,6 +39,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and a.file_type = 'VIDEO' "
+
"and lc.applicable_scope = 'THIS_ORGAN' "
+
"and lc.organ_code = #{organCode} "
+
"UNION ALL "
...
...
@@ -59,6 +60,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and a.file_type = 'VIDEO' "
+
"and lc.applicable_scope = 'THIS_ORGAN_SUB'"
+
"and lc.organ_code like CONCAT(#{organCode},'%') "
+
"UNION ALL "
...
...
@@ -78,6 +80,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+
"and lcb.exhibition_board_id = eb.id "
+
"and eb.video_content_id = vc.id "
+
"and vc.id = a.ref_item_id "
+
"and a.file_type = 'VIDEO' "
+
"and lc.applicable_scope = 'ALL_PLAT'"
+
"UNION ALL "
+
"SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name, eb.cover exhibition_board_cover "
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java
View file @
15cba528
...
...
@@ -381,8 +381,6 @@ public class LearningContentController extends BaseController {
final
List
<
Audit
>
auditList
=
this
.
auditService
.
list
(
auditQueryWrapper
);
learningContent
.
setAuditHistoryList
(
auditList
);
return
getResult
(
learningContent
);
}
...
...
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