Commit 12a2b736 authored by liqin's avatar liqin 💬

bug fixed

parent e82d56ae
...@@ -99,6 +99,7 @@ public class ExhibitionBoardController extends BaseController { ...@@ -99,6 +99,7 @@ public class ExhibitionBoardController extends BaseController {
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(exhibitionBoard.getName()) .content(exhibitionBoard.getName())
.name(exhibitionBoard.getName())
.refItemId(exhibitionBoard.getId()) .refItemId(exhibitionBoard.getId())
.userId(user.getId()) .userId(user.getId())
.type(AuditTypeEnum.EXHIBITION_BOARD.name()) .type(AuditTypeEnum.EXHIBITION_BOARD.name())
...@@ -167,6 +168,7 @@ public class ExhibitionBoardController extends BaseController { ...@@ -167,6 +168,7 @@ public class ExhibitionBoardController extends BaseController {
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(exhibitionBoard.getName()) .content(exhibitionBoard.getName())
.name(exhibitionBoard.getName())
.refItemId(exhibitionBoard.getId()) .refItemId(exhibitionBoard.getId())
.userId(user.getId()) .userId(user.getId())
.type(AuditTypeEnum.EXHIBITION_BOARD.name()) .type(AuditTypeEnum.EXHIBITION_BOARD.name())
...@@ -397,9 +399,11 @@ public class ExhibitionBoardController extends BaseController { ...@@ -397,9 +399,11 @@ public class ExhibitionBoardController extends BaseController {
@MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.UPPER) @MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.UPPER)
public Map<String, Object> enableExhibitionBoard(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) { public Map<String, Object> enableExhibitionBoard(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
TUser user = getcurUser(); TUser user = getcurUser();
final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(id);
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.userId(user.getId()) .userId(user.getId())
.content(this.exhibitionBoardService.getById(id).getName()) .content(exhibitionBoard.getName())
.name(exhibitionBoard.getName())
.refItemId(id) .refItemId(id)
.type(AuditTypeEnum.EXHIBITION_BOARD.name()) .type(AuditTypeEnum.EXHIBITION_BOARD.name())
.operation(isPublish ? AuditOperationEnum.UPPER.name() : AuditOperationEnum.LOWER.name()) .operation(isPublish ? AuditOperationEnum.UPPER.name() : AuditOperationEnum.LOWER.name())
...@@ -420,8 +424,10 @@ public class ExhibitionBoardController extends BaseController { ...@@ -420,8 +424,10 @@ public class ExhibitionBoardController extends BaseController {
@MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.DELETE) @MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.DELETE)
public Map<String, Object> deleteExhibitionBoard(@PathVariable("id") String id) { public Map<String, Object> deleteExhibitionBoard(@PathVariable("id") String id) {
TUser user = getcurUser(); TUser user = getcurUser();
final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(id);
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(this.exhibitionBoardService.getById(id).getName()) .content(exhibitionBoard.getName())
.name(exhibitionBoard.getName())
.userId(user.getId()) .userId(user.getId())
.refItemId(id) .refItemId(id)
.type(AuditTypeEnum.EXHIBITION_BOARD.name()) .type(AuditTypeEnum.EXHIBITION_BOARD.name())
......
...@@ -133,6 +133,7 @@ public class LearningContentController extends BaseController { ...@@ -133,6 +133,7 @@ public class LearningContentController extends BaseController {
if (result) { if (result) {
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(learningContent.getName()) .content(learningContent.getName())
.name(learningContent.getName())
.refItemId(learningContent.getId()) .refItemId(learningContent.getId())
.type(AuditTypeEnum.LEARNING_CONTENT.name()) .type(AuditTypeEnum.LEARNING_CONTENT.name())
.userId(tUser.getId()) .userId(tUser.getId())
...@@ -206,6 +207,7 @@ public class LearningContentController extends BaseController { ...@@ -206,6 +207,7 @@ public class LearningContentController extends BaseController {
if (flag) { if (flag) {
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(learningContent.getName()) .content(learningContent.getName())
.name(learningContent.getName())
.userId(user.getId()) .userId(user.getId())
.refItemId(learningContent.getId()) .refItemId(learningContent.getId())
.type(AuditTypeEnum.LEARNING_CONTENT.name()) .type(AuditTypeEnum.LEARNING_CONTENT.name())
...@@ -502,8 +504,11 @@ public class LearningContentController extends BaseController { ...@@ -502,8 +504,11 @@ public class LearningContentController extends BaseController {
@MethodLog(operModule = OperModule.LEARNCONTENT, operType = OperType.ENABLE) @MethodLog(operModule = OperModule.LEARNCONTENT, operType = OperType.ENABLE)
public Map<String, Object> enableLearningContent(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) { public Map<String, Object> enableLearningContent(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
TUser user = getcurUser(); TUser user = getcurUser();
LearningContent learningContent = this.learningContentService.getById(id);
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(this.learningContentService.getById(id).getName()) .content(learningContent.getName())
.name(learningContent.getName())
.refItemId(id) .refItemId(id)
.userId(user.getId()) .userId(user.getId())
.type(AuditTypeEnum.LEARNING_CONTENT.name()) .type(AuditTypeEnum.LEARNING_CONTENT.name())
......
...@@ -94,6 +94,7 @@ public class VideoContentController extends BaseController { ...@@ -94,6 +94,7 @@ public class VideoContentController extends BaseController {
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(videoContent.getName()) .content(videoContent.getName())
.name(videoContent.getName())
.userId(user.getId()) .userId(user.getId())
.refItemId(videoContent.getId()) .refItemId(videoContent.getId())
.type(AuditTypeEnum.VIDEO_CONTENT.name()) .type(AuditTypeEnum.VIDEO_CONTENT.name())
...@@ -148,6 +149,7 @@ public class VideoContentController extends BaseController { ...@@ -148,6 +149,7 @@ public class VideoContentController extends BaseController {
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(videoContent.getName()) .content(videoContent.getName())
.name(videoContent.getName())
.userId(user.getId()) .userId(user.getId())
.refItemId(videoContent.getId()) .refItemId(videoContent.getId())
.type(AuditTypeEnum.VIDEO_CONTENT.name()) .type(AuditTypeEnum.VIDEO_CONTENT.name())
...@@ -319,8 +321,10 @@ public class VideoContentController extends BaseController { ...@@ -319,8 +321,10 @@ public class VideoContentController extends BaseController {
@MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.DELETE) @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.DELETE)
public Map<String, Object> deleteVideoContent(@PathVariable("id") String id) { public Map<String, Object> deleteVideoContent(@PathVariable("id") String id) {
TUser user = getcurUser(); TUser user = getcurUser();
final VideoContent videoContent = this.videoContentService.getById(id);
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(this.videoContentService.getById(id).getName()) .content(videoContent.getName())
.name(videoContent.getName())
.refItemId(id) .refItemId(id)
.userId(user.getId()) .userId(user.getId())
.type(AuditTypeEnum.VIDEO_CONTENT.name()) .type(AuditTypeEnum.VIDEO_CONTENT.name())
......
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