Commit 775a6789 authored by nie'hong's avatar nie'hong

修改-修改展板报错

parent 2d207f8f
...@@ -167,22 +167,17 @@ public class ExhibitionBoardController extends BaseController { ...@@ -167,22 +167,17 @@ public class ExhibitionBoardController extends BaseController {
return getFailResult("400", "名称已存在,请修改名称"); return getFailResult("400", "名称已存在,请修改名称");
} }
List<String> audioIdList = exhibitionBoard.getAudioIdList(); List<String> audioIdList = exhibitionBoard.getAudioIdList();
if (CollectionUtil.isEmpty(audioIdList)) {
audioIdList = new ArrayList<>();
}
// if (audioIdList == null || audioIdList.isEmpty()) { // if (audioIdList == null || audioIdList.isEmpty()) {
// return getFailResult("400", "导览音频文件必须上传"); // return getFailResult("400", "导览音频文件必须上传");
// } // }
List<String> datumIdList = exhibitionBoard.getDatumIdList(); List<String> datumIdList = exhibitionBoard.getDatumIdList();
if (CollectionUtil.isEmpty(datumIdList)) {
audioIdList = new ArrayList<>();
}
// if (datumIdList == null || datumIdList.isEmpty()) { // if (datumIdList == null || datumIdList.isEmpty()) {
// return getFailResult("400", "参考资料文件必须上传"); // return getFailResult("400", "参考资料文件必须上传");
// } // }
// 2021-05-31修改前 // 2021-05-31修改前
// removeNotInIds(audioIdList,exhibitionBoard.getId()); // removeNotInIds(audioIdList,exhibitionBoard.getId());
if (CollectionUtil.isNotEmpty(audioIdList)) {
for (String audioId : audioIdList) { for (String audioId : audioIdList) {
final Asset asset = this.assetService.getById(audioId); final Asset asset = this.assetService.getById(audioId);
if (asset.getPublished()) { if (asset.getPublished()) {
...@@ -192,9 +187,12 @@ public class ExhibitionBoardController extends BaseController { ...@@ -192,9 +187,12 @@ public class ExhibitionBoardController extends BaseController {
this.assetService.updateById(asset); this.assetService.updateById(asset);
} }
} }
}
// 2021-05-31修改前 // 2021-05-31修改前
// removeNotInIds(audioIdList,exhibitionBoard.getId()); // removeNotInIds(audioIdList,exhibitionBoard.getId());
if (CollectionUtil.isNotEmpty(datumIdList)) {
for (String datumId : datumIdList) { for (String datumId : datumIdList) {
final Asset asset = this.assetService.getById(datumId); final Asset asset = this.assetService.getById(datumId);
if (asset == null) { if (asset == null) {
...@@ -206,6 +204,8 @@ public class ExhibitionBoardController extends BaseController { ...@@ -206,6 +204,8 @@ public class ExhibitionBoardController extends BaseController {
this.assetService.updateById(asset); this.assetService.updateById(asset);
} }
} }
}
// 2021-05-31修改后 // 2021-05-31修改后
audioIdList.addAll(datumIdList); audioIdList.addAll(datumIdList);
if (CollectionUtil.isNotEmpty(audioIdList)) { if (CollectionUtil.isNotEmpty(audioIdList)) {
......
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