Commit 6d691660 authored by wzp's avatar wzp

修改bug

parent 7df89db1
...@@ -7,6 +7,7 @@ import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam; ...@@ -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.CopyrightOwner;
import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard; import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
import cn.wisenergy.chnmuseum.party.model.ExhibitionBoardCat; 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.CopyrightOwnerService;
import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardCatService; import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardCatService;
import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService; import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
...@@ -112,7 +113,7 @@ public class ExhibitionBoardCatController extends BaseController { ...@@ -112,7 +113,7 @@ public class ExhibitionBoardCatController extends BaseController {
@RequiresAuthentication //@RequiresPermissions("exhibition:board:cat:list") @RequiresAuthentication //@RequiresPermissions("exhibition:board:cat:list")
@ApiOperation(value = "获取展板分类全部列表(无分页)", notes = "获取展板分类全部列表(无分页)") @ApiOperation(value = "获取展板分类全部列表(无分页)", notes = "获取展板分类全部列表(无分页)")
public Map<String, Object> getExhibitionBoardCatList() { 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); return getResult(exhibitionBoardCatList);
} }
......
...@@ -219,8 +219,9 @@ public class ExhibitionBoardController extends BaseController { ...@@ -219,8 +219,9 @@ public class ExhibitionBoardController extends BaseController {
if (boardCopyrightOwnerIdList != null && !boardCopyrightOwnerIdList.isEmpty()) { if (boardCopyrightOwnerIdList != null && !boardCopyrightOwnerIdList.isEmpty()) {
lambdaQueryWrapper.in(ExhibitionBoard::getBoardCopyrightOwnerId, boardCopyrightOwnerIdList); lambdaQueryWrapper.in(ExhibitionBoard::getBoardCopyrightOwnerId, boardCopyrightOwnerIdList);
} }
lambdaQueryWrapper.eq(ExhibitionBoard::getPublished,true);
lambdaQueryWrapper.orderByDesc(ExhibitionBoard::getCreateTime); lambdaQueryWrapper.orderByDesc(ExhibitionBoard::getCreateTime);
List<ExhibitionBoard> exhibitionBoardList = exhibitionBoardService.list(); List<ExhibitionBoard> exhibitionBoardList = exhibitionBoardService.list(lambdaQueryWrapper);
for (ExhibitionBoard exhibitionBoard : exhibitionBoardList) { for (ExhibitionBoard exhibitionBoard : exhibitionBoardList) {
if (exhibitionBoard.getBoardCopyrightOwnerId() != null) { if (exhibitionBoard.getBoardCopyrightOwnerId() != null) {
String name = this.copyrightOwnerService.getById(exhibitionBoard.getBoardCopyrightOwnerId()).getName(); String name = this.copyrightOwnerService.getById(exhibitionBoard.getBoardCopyrightOwnerId()).getName();
......
...@@ -208,7 +208,7 @@ public class LearningContentController extends BaseController { ...@@ -208,7 +208,7 @@ public class LearningContentController extends BaseController {
final LambdaQueryWrapper<LearningContent> lambdaQueryWrapper = Wrappers.<LearningContent>lambdaQuery().eq(LearningContent::getAuditStatus, auditStatus.name()); final LambdaQueryWrapper<LearningContent> lambdaQueryWrapper = Wrappers.<LearningContent>lambdaQuery().eq(LearningContent::getAuditStatus, auditStatus.name());
lambdaQueryWrapper.eq(LearningContent::getPublished, true); lambdaQueryWrapper.eq(LearningContent::getPublished, true);
lambdaQueryWrapper.eq(LearningContent::getDeleted, false); lambdaQueryWrapper.eq(LearningContent::getDeleted, false);
List<LearningContent> learningContentList = learningContentService.list(); List<LearningContent> learningContentList = learningContentService.list(lambdaQueryWrapper);
return getResult(learningContentList); return getResult(learningContentList);
} }
......
...@@ -148,7 +148,7 @@ public class TOrganController extends BaseController { ...@@ -148,7 +148,7 @@ public class TOrganController extends BaseController {
TOrgan tOrgan = tOrganService.getById(id); TOrgan tOrgan = tOrganService.getById(id);
tOrgan.setIsDeleted(true); tOrgan.setIsDeleted(true);
tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis())); tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
result = tOrganService.updateById(tOrgan); result = tOrganService.removeById(tOrgan);
if (!result) { if (!result) {
return getFailResult(); return getFailResult();
} }
......
...@@ -80,7 +80,7 @@ public class VideoContentCatController extends BaseController { ...@@ -80,7 +80,7 @@ public class VideoContentCatController extends BaseController {
@RequiresAuthentication //@RequiresPermissions("video:content:cat:list") @RequiresAuthentication //@RequiresPermissions("video:content:cat:list")
@ApiOperation(value = "获取视频内容分类全部列表(无分页)", notes = "获取视频内容分类全部列表(无分页)") @ApiOperation(value = "获取视频内容分类全部列表(无分页)", notes = "获取视频内容分类全部列表(无分页)")
public Map<String, Object> getVideoContentCatList() { 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); return getResult(videoContentCatList);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment