Skip to content

C
chnmuseum-party
Commit 44d0dc5d authored by liqin's avatar liqin 💬
Browse files
Options

bug fixed

parent 4b2394c6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 14 deletions
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @ 44d0dc5d
package cn.wisenergy.chnmuseum.party.web.controller; package cn.wisenergy.chnmuseum.party.web.controller;
import cn.wisenergy.chnmuseum.party.common.dfs.FastDFSUtils;
import cn.wisenergy.chnmuseum.party.common.enums.*; import cn.wisenergy.chnmuseum.party.common.enums.*;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add; import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update; import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
...@@ -130,12 +129,7 @@ public class ExhibitionBoardController extends BaseController { ...@@ -130,12 +129,7 @@ public class ExhibitionBoardController extends BaseController {
this.assetService.updateById(asset); this.assetService.updateById(asset);
collect.remove(audioId); collect.remove(audioId);
} }
collect.forEach((k, v) -> { collect.forEach((k, v) -> this.assetService.removeById(k));
final boolean deleted = this.assetService.removeById(k);
if (deleted) {
FastDFSUtils.deleteFile(v);
}
});
} }
final List<String> datumIdList = exhibitionBoard.getDatumIdList(); final List<String> datumIdList = exhibitionBoard.getDatumIdList();
...@@ -151,12 +145,7 @@ public class ExhibitionBoardController extends BaseController { ...@@ -151,12 +145,7 @@ public class ExhibitionBoardController extends BaseController {
this.assetService.updateById(asset); this.assetService.updateById(asset);
collect.remove(datumId); collect.remove(datumId);
} }
collect.forEach((k, v) -> { collect.forEach((k, v) -> this.assetService.removeById(k));
final boolean deleted = this.assetService.removeById(k);
if (deleted) {
FastDFSUtils.deleteFile(v);
}
});
} }
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
...@@ -219,7 +208,7 @@ public class ExhibitionBoardController extends BaseController { ...@@ -219,7 +208,7 @@ 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.eq(ExhibitionBoard::getPublished, true);
lambdaQueryWrapper.orderByDesc(ExhibitionBoard::getCreateTime); lambdaQueryWrapper.orderByDesc(ExhibitionBoard::getCreateTime);
List<ExhibitionBoard> exhibitionBoardList = exhibitionBoardService.list(lambdaQueryWrapper); List<ExhibitionBoard> exhibitionBoardList = exhibitionBoardService.list(lambdaQueryWrapper);
for (ExhibitionBoard exhibitionBoard : exhibitionBoardList) { for (ExhibitionBoard exhibitionBoard : exhibitionBoardList) {
......
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