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
6d691660
Commit
6d691660
authored
Apr 09, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
7df89db1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
5 deletions
+7
-5
ExhibitionBoardCatController.java
...um/party/web/controller/ExhibitionBoardCatController.java
+2
-1
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+2
-1
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+1
-1
TOrganController.java
...ergy/chnmuseum/party/web/controller/TOrganController.java
+1
-1
VideoContentCatController.java
...useum/party/web/controller/VideoContentCatController.java
+1
-1
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java
View file @
6d691660
...
...
@@ -7,6 +7,7 @@ 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
;
...
...
@@ -112,7 +113,7 @@ public class ExhibitionBoardCatController extends BaseController {
@RequiresAuthentication
//@RequiresPermissions("exhibition:board:cat:list")
@ApiOperation
(
value
=
"获取展板分类全部列表(无分页)"
,
notes
=
"获取展板分类全部列表(无分页)"
)
public
Map
<
String
,
Object
>
getExhibitionBoardCatList
()
{
List
<
ExhibitionBoardCat
>
exhibitionBoardCatList
=
exhibitionBoardCatService
.
list
(
Wrappers
.<
ExhibitionBoardCat
>
lambdaQuery
().
orderByDesc
(
ExhibitionBoardCat:
:
getCreateTime
));
List
<
ExhibitionBoardCat
>
exhibitionBoardCatList
=
exhibitionBoardCatService
.
list
(
Wrappers
.<
ExhibitionBoardCat
>
lambdaQuery
().
eq
(
ExhibitionBoardCat:
:
getDeleted
,
false
).
orderByDesc
(
ExhibitionBoardCat:
:
getCreateTime
));
return
getResult
(
exhibitionBoardCatList
);
}
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
6d691660
...
...
@@ -219,8 +219,9 @@ public class ExhibitionBoardController extends BaseController {
if
(
boardCopyrightOwnerIdList
!=
null
&&
!
boardCopyrightOwnerIdList
.
isEmpty
())
{
lambdaQueryWrapper
.
in
(
ExhibitionBoard:
:
getBoardCopyrightOwnerId
,
boardCopyrightOwnerIdList
);
}
lambdaQueryWrapper
.
eq
(
ExhibitionBoard:
:
getPublished
,
true
);
lambdaQueryWrapper
.
orderByDesc
(
ExhibitionBoard:
:
getCreateTime
);
List
<
ExhibitionBoard
>
exhibitionBoardList
=
exhibitionBoardService
.
list
();
List
<
ExhibitionBoard
>
exhibitionBoardList
=
exhibitionBoardService
.
list
(
lambdaQueryWrapper
);
for
(
ExhibitionBoard
exhibitionBoard
:
exhibitionBoardList
)
{
if
(
exhibitionBoard
.
getBoardCopyrightOwnerId
()
!=
null
)
{
String
name
=
this
.
copyrightOwnerService
.
getById
(
exhibitionBoard
.
getBoardCopyrightOwnerId
()).
getName
();
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java
View file @
6d691660
...
...
@@ -208,7 +208,7 @@ public class LearningContentController extends BaseController {
final
LambdaQueryWrapper
<
LearningContent
>
lambdaQueryWrapper
=
Wrappers
.<
LearningContent
>
lambdaQuery
().
eq
(
LearningContent:
:
getAuditStatus
,
auditStatus
.
name
());
lambdaQueryWrapper
.
eq
(
LearningContent:
:
getPublished
,
true
);
lambdaQueryWrapper
.
eq
(
LearningContent:
:
getDeleted
,
false
);
List
<
LearningContent
>
learningContentList
=
learningContentService
.
list
();
List
<
LearningContent
>
learningContentList
=
learningContentService
.
list
(
lambdaQueryWrapper
);
return
getResult
(
learningContentList
);
}
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java
View file @
6d691660
...
...
@@ -148,7 +148,7 @@ public class TOrganController extends BaseController {
TOrgan
tOrgan
=
tOrganService
.
getById
(
id
);
tOrgan
.
setIsDeleted
(
true
);
tOrgan
.
setUpdateTime
(
DateUtil80
.
getDateTimeOfTimestamp
(
System
.
currentTimeMillis
()));
result
=
tOrganService
.
updat
eById
(
tOrgan
);
result
=
tOrganService
.
remov
eById
(
tOrgan
);
if
(!
result
)
{
return
getFailResult
();
}
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentCatController.java
View file @
6d691660
...
...
@@ -80,7 +80,7 @@ public class VideoContentCatController extends BaseController {
@RequiresAuthentication
//@RequiresPermissions("video:content:cat:list")
@ApiOperation
(
value
=
"获取视频内容分类全部列表(无分页)"
,
notes
=
"获取视频内容分类全部列表(无分页)"
)
public
Map
<
String
,
Object
>
getVideoContentCatList
()
{
List
<
VideoContentCat
>
videoContentCatList
=
videoContentCatService
.
list
(
Wrappers
.<
VideoContentCat
>
lambdaQuery
().
orderByDesc
(
VideoContentCat:
:
getCreateTime
));
List
<
VideoContentCat
>
videoContentCatList
=
videoContentCatService
.
list
(
Wrappers
.<
VideoContentCat
>
lambdaQuery
().
eq
(
VideoContentCat:
:
getDeleted
,
false
).
orderByDesc
(
VideoContentCat:
:
getCreateTime
));
return
getResult
(
videoContentCatList
);
}
...
...
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