Commit bdd83375 authored by liqin's avatar liqin 💬

bug fixed

parent 125805fe
...@@ -353,15 +353,6 @@ public class ExhibitionBoardController extends BaseController { ...@@ -353,15 +353,6 @@ public class ExhibitionBoardController extends BaseController {
exhibitionBoard.setDatumIdList(datumList.stream().map(Asset::getId).collect(Collectors.toList())); exhibitionBoard.setDatumIdList(datumList.stream().map(Asset::getId).collect(Collectors.toList()));
final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, exhibitionBoard.getId()); final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, exhibitionBoard.getId());
auditQueryWrapper.select(Audit::getContent);
auditQueryWrapper.select(Audit::getType);
auditQueryWrapper.select(Audit::getOperation);
auditQueryWrapper.select(Audit::getStatus);
auditQueryWrapper.select(Audit::getFirstTime);
auditQueryWrapper.select(Audit::getFirstRemarks);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getLevel);
final List<Audit> auditList = this.auditService.list(auditQueryWrapper); final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
exhibitionBoard.setAuditHistoryList(auditList); exhibitionBoard.setAuditHistoryList(auditList);
...@@ -421,15 +412,6 @@ public class ExhibitionBoardController extends BaseController { ...@@ -421,15 +412,6 @@ public class ExhibitionBoardController extends BaseController {
} }
final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, exhibitionBoard.getId()); final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, exhibitionBoard.getId());
auditQueryWrapper.select(Audit::getContent);
auditQueryWrapper.select(Audit::getType);
auditQueryWrapper.select(Audit::getOperation);
auditQueryWrapper.select(Audit::getStatus);
auditQueryWrapper.select(Audit::getFirstTime);
auditQueryWrapper.select(Audit::getFirstRemarks);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getLevel);
final List<Audit> auditList = this.auditService.list(auditQueryWrapper); final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
exhibitionBoard.setAuditHistoryList(auditList); exhibitionBoard.setAuditHistoryList(auditList);
......
...@@ -360,15 +360,6 @@ public class LearningContentController extends BaseController { ...@@ -360,15 +360,6 @@ public class LearningContentController extends BaseController {
} }
final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id); final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id);
auditQueryWrapper.select(Audit::getContent);
auditQueryWrapper.select(Audit::getType);
auditQueryWrapper.select(Audit::getOperation);
auditQueryWrapper.select(Audit::getStatus);
auditQueryWrapper.select(Audit::getFirstTime);
auditQueryWrapper.select(Audit::getFirstRemarks);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getLevel);
final List<Audit> auditList = this.auditService.list(auditQueryWrapper); final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
learningContent.setAuditHistoryList(auditList); learningContent.setAuditHistoryList(auditList);
...@@ -464,17 +455,7 @@ public class LearningContentController extends BaseController { ...@@ -464,17 +455,7 @@ public class LearningContentController extends BaseController {
} }
learningContent.setExhibitionBoardList(exhibitionBoardList); learningContent.setExhibitionBoardList(exhibitionBoardList);
} }
final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id); final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id);
auditQueryWrapper.select(Audit::getContent);
auditQueryWrapper.select(Audit::getType);
auditQueryWrapper.select(Audit::getOperation);
auditQueryWrapper.select(Audit::getStatus);
auditQueryWrapper.select(Audit::getFirstTime);
auditQueryWrapper.select(Audit::getFirstRemarks);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getLevel);
final List<Audit> auditList = this.auditService.list(auditQueryWrapper); final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
learningContent.setAuditHistoryList(auditList); learningContent.setAuditHistoryList(auditList);
......
...@@ -101,6 +101,7 @@ public class VideoContentController extends BaseController { ...@@ -101,6 +101,7 @@ public class VideoContentController extends BaseController {
.content(videoContent.getName()) .content(videoContent.getName())
.name(videoContent.getName()) .name(videoContent.getName())
.userId(getcurUser().getId()) .userId(getcurUser().getId())
.organId(getcurUser().getOrgId())
.refItemId(videoContent.getId()) .refItemId(videoContent.getId())
.type(AuditTypeEnum.VIDEO_CONTENT.name()) .type(AuditTypeEnum.VIDEO_CONTENT.name())
.operation(AuditOperationEnum.ADD.name()) .operation(AuditOperationEnum.ADD.name())
...@@ -148,6 +149,7 @@ public class VideoContentController extends BaseController { ...@@ -148,6 +149,7 @@ public class VideoContentController extends BaseController {
.content(videoContent.getName()) .content(videoContent.getName())
.name(videoContent.getName()) .name(videoContent.getName())
.userId(getcurUser().getId()) .userId(getcurUser().getId())
.organId(getcurUser().getOrgId())
.refItemId(videoContent.getId()) .refItemId(videoContent.getId())
.type(AuditTypeEnum.VIDEO_CONTENT.name()) .type(AuditTypeEnum.VIDEO_CONTENT.name())
.operation(AuditOperationEnum.EDIT.name()) .operation(AuditOperationEnum.EDIT.name())
...@@ -292,6 +294,11 @@ public class VideoContentController extends BaseController { ...@@ -292,6 +294,11 @@ public class VideoContentController extends BaseController {
final List<Asset> videoFileList = this.assetService.list(assetQueryWrapper); final List<Asset> videoFileList = this.assetService.list(assetQueryWrapper);
videoContent.setVideoFileList(videoFileList); videoContent.setVideoFileList(videoFileList);
videoContent.setVideoFileIdList(videoFileList.stream().map(Asset::getId).collect(Collectors.toList())); videoContent.setVideoFileIdList(videoFileList.stream().map(Asset::getId).collect(Collectors.toList()));
final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id);
final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
videoContent.setAuditHistoryList(auditList);
return getResult(videoContent); return getResult(videoContent);
} }
...@@ -325,15 +332,6 @@ public class VideoContentController extends BaseController { ...@@ -325,15 +332,6 @@ public class VideoContentController extends BaseController {
videoContent.setVideoFileIdList(videoFileList.stream().map(Asset::getId).collect(Collectors.toList())); videoContent.setVideoFileIdList(videoFileList.stream().map(Asset::getId).collect(Collectors.toList()));
final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id); final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id);
auditQueryWrapper.select(Audit::getContent);
auditQueryWrapper.select(Audit::getType);
auditQueryWrapper.select(Audit::getOperation);
auditQueryWrapper.select(Audit::getStatus);
auditQueryWrapper.select(Audit::getFirstTime);
auditQueryWrapper.select(Audit::getFirstRemarks);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getSecondTime);
auditQueryWrapper.select(Audit::getLevel);
final List<Audit> auditList = this.auditService.list(auditQueryWrapper); final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
videoContent.setAuditHistoryList(auditList); videoContent.setAuditHistoryList(auditList);
......
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