Commit 3787ebc2 authored by nie'hong's avatar nie'hong

修改-修改展板出错

parent 4704c9ef
......@@ -148,6 +148,7 @@ public class AssetController extends BaseController {
final String fileName = TimeUtils.format(LocalDateTime.now(), TimeUtils.FORMAT_ONE) + "视频集.zip";
response.addHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
final Map<String, InputStream> map = new LinkedHashMap<>(idList.size());
final List<Asset> assetList = assetService.listByIds(idList);
for (Asset asset : assetList) {
......
......@@ -168,14 +168,14 @@ public class ExhibitionBoardController extends BaseController {
}
List<String> audioIdList = exhibitionBoard.getAudioIdList();
if (CollectionUtil.isEmpty(audioIdList)) {
audioIdList = Collections.emptyList();
audioIdList = new ArrayList<>();
}
// if (audioIdList == null || audioIdList.isEmpty()) {
// return getFailResult("400", "导览音频文件必须上传");
// }
List<String> datumIdList = exhibitionBoard.getDatumIdList();
if (CollectionUtil.isEmpty(datumIdList)) {
datumIdList = Collections.emptyList();
audioIdList = new ArrayList<>();
}
// if (datumIdList == null || datumIdList.isEmpty()) {
// return getFailResult("400", "参考资料文件必须上传");
......
......@@ -309,6 +309,8 @@ public class LearningContentController extends BaseController {
queryWrapper.and(s -> s.in(LearningContent::getOrganCode, curUserSubOrgIds).or()
.in(LearningContent::getApplicableScope, list));
}
// 根据创建时间区间检索
if (genericPageParam.getIsPublished() != null) {
queryWrapper.eq(LearningContent::getPublished, genericPageParam.getIsPublished());
......
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