bug fixed

src/main/java/cn/chnmuseum/party/service/impl/AuditServiceImpl.java

@@ -304,7 +304,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
                     final LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
                     assetQueryWrapper.eq(Asset::getPublished, true);
                     final List<Asset> assetList = this.assetMapper.selectList(assetQueryWrapper);
-                    final Map<String, String> collect = assetList.stream().collect(Collectors.toMap(Asset::getId, Asset::getFileUrl));
+                    final Map<String, String> collect = assetList.stream().collect(Collectors.toMap(Asset::getId, Asset::getFileUrlCrypto));
                     for (String videoFileId : videoFileIdList) {
                         final Asset asset = this.assetMapper.selectById(videoFileId);
                         asset.setThumbnail(videoContent.getThumbnail());
@@ -409,7 +409,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
                     assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
                     assetQueryWrapper.eq(Asset::getPublished, true);
                     final List<Asset> assetList = this.assetMapper.selectList(assetQueryWrapper);
-                    final Map<String, String> collect = assetList.stream().collect(Collectors.toMap(Asset::getId, Asset::getFileUrl));
+                    final List<String> collect = assetList.stream().map(Asset::getId).collect(Collectors.toList());
                     for (String datumId : datumIdList) {
                         final Asset asset = this.assetMapper.selectById(datumId);
                         asset.setFileCat(FileCatEnum.EXHIBITION_BOARD_DATUM.name());
@@ -419,7 +419,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
                         collect.remove(datumId);
                     }
                     if (!collect.isEmpty()) {
-                        this.assetMapper.deleteBatchIds(collect.keySet());
+                        this.assetMapper.deleteBatchIds(collect);
                     }
                 }
                 one.setAuditStatus(audit.getStatus());

src/main/java/cn/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -103,6 +103,7 @@ public class ExhibitionBoardController extends BaseController {
                     .name(exhibitionBoard.getName())
                     .refItemId(exhibitionBoard.getId())
                     .userId(user.getId())
+                    .organId(user.getOrgId())
                     .type(AuditTypeEnum.EXHIBITION_BOARD.name())
                     .operation(AuditOperationEnum.ADD.name())
                     .status(AuditStatusEnum.TBC.name())
@@ -157,11 +158,13 @@ public class ExhibitionBoardController extends BaseController {
         one.setAuditStatus(AuditStatusEnum.TBC.name());
         this.exhibitionBoardService.updateById(one);
 
+        final TUser user = getcurUser();
         final Audit audit = Audit.builder()
                 .content(exhibitionBoard.getName())
                 .name(exhibitionBoard.getName())
                 .refItemId(exhibitionBoard.getId())
-                .userId(getcurUser().getId())
+                .userId(user.getId())
+                .organId(user.getOrgId())
                 .type(AuditTypeEnum.EXHIBITION_BOARD.name())
                 .operation(AuditOperationEnum.EDIT.name())
                 .status(AuditStatusEnum.TBC.name())
@@ -443,6 +446,7 @@ public class ExhibitionBoardController extends BaseController {
                 .content(exhibitionBoard.getName())
                 .name(exhibitionBoard.getName())
                 .refItemId(id)
+                .organId(user.getOrgId())
                 .type(AuditTypeEnum.EXHIBITION_BOARD.name())
                 .operation(isPublish ? AuditOperationEnum.UPPER.name() : AuditOperationEnum.LOWER.name())
                 .status(AuditStatusEnum.TBC.name())
@@ -468,6 +472,7 @@ public class ExhibitionBoardController extends BaseController {
                 .name(exhibitionBoard.getName())
                 .userId(user.getId())
                 .refItemId(id)
+                .organId(user.getOrgId())
                 .type(AuditTypeEnum.EXHIBITION_BOARD.name())
                 .operation(AuditOperationEnum.REMOVE.name())
                 .status(AuditStatusEnum.TBC.name())

src/main/java/cn/chnmuseum/party/web/controller/LearningContentController.java

@@ -137,6 +137,7 @@ public class LearningContentController extends BaseController {
                     .refItemId(learningContent.getId())
                     .type(AuditTypeEnum.LEARNING_CONTENT.name())
                     .userId(tUser.getId())
+                    .organId(tUser.getOrgId())
                     .operation(AuditOperationEnum.ADD.name())
                     .status(AuditStatusEnum.TBC.name())
                     .level(AuditStatusEnum.TBC.name())
@@ -165,10 +166,12 @@ public class LearningContentController extends BaseController {
         one.setAuditStatus(AuditStatusEnum.TBC.name());
         this.learningContentService.updateById(one);
 
+        final TUser tUser = getcurUser();
         final Audit audit = Audit.builder()
                 .content(learningContent.getName())
                 .name(learningContent.getName())
-                .userId(getcurUser().getId())
+                .userId(tUser.getId())
+                .organId(tUser.getOrgId())
                 .refItemId(learningContent.getId())
                 .type(AuditTypeEnum.LEARNING_CONTENT.name())
                 .operation(AuditOperationEnum.EDIT.name())
@@ -396,7 +399,7 @@ public class LearningContentController extends BaseController {
         }
 
         final List<String> exhibitionBoardIdList = learningContent.getExhibitionBoardIdList();
-        if (exhibitionBoardIdList!= null && !exhibitionBoardIdList.isEmpty()) {
+        if (exhibitionBoardIdList != null && !exhibitionBoardIdList.isEmpty()) {
             final List<ExhibitionBoard> exhibitionBoardList = this.exhibitionBoardService.listByIds(exhibitionBoardIdList);
             if (!exhibitionBoardList.isEmpty()) {
                 learningContent.setExhibitionBoardIdList(exhibitionBoardIdList);
@@ -545,7 +548,7 @@ public class LearningContentController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("learning:content:enable")
     @MethodLog(operModule = OperModule.LEARNCONTENT, operType = OperType.ENABLE)
     public Map<String, Object> enableLearningContent(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
-        TUser user = getcurUser();
+        final TUser user = getcurUser();
 
         LearningContent learningContent = this.learningContentService.getById(id);
         final Audit audit = Audit.builder()
@@ -553,6 +556,7 @@ public class LearningContentController extends BaseController {
                 .name(learningContent.getName())
                 .refItemId(id)
                 .userId(user.getId())
+                .organId(user.getOrgId())
                 .type(AuditTypeEnum.LEARNING_CONTENT.name())
                 .operation(isPublish ? AuditOperationEnum.ENABLE.name() : AuditOperationEnum.DISABLE.name())
                 .status(AuditStatusEnum.TBC.name())