Commit bc94e8e2 authored by liqin's avatar liqin 💬

bug fixed

parent 008c9d5b
...@@ -4,6 +4,7 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum; ...@@ -4,6 +4,7 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum;
import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum; import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum; import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum;
import cn.wisenergy.chnmuseum.party.common.mvc.InterfaceException; import cn.wisenergy.chnmuseum.party.common.mvc.InterfaceException;
import cn.wisenergy.chnmuseum.party.mapper.AssetMapper;
import cn.wisenergy.chnmuseum.party.mapper.AuditMapper; import cn.wisenergy.chnmuseum.party.mapper.AuditMapper;
import cn.wisenergy.chnmuseum.party.model.*; import cn.wisenergy.chnmuseum.party.model.*;
import cn.wisenergy.chnmuseum.party.service.*; import cn.wisenergy.chnmuseum.party.service.*;
...@@ -40,6 +41,9 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements ...@@ -40,6 +41,9 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
@Resource @Resource
private AuditMapper auditMapper; private AuditMapper auditMapper;
@Resource
private AssetMapper assetMapper;
@Resource @Resource
private TUserServiceImpl userService; private TUserServiceImpl userService;
...@@ -61,12 +65,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements ...@@ -61,12 +65,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
@Resource @Resource
private LearningContentCopyrightOwnerService learningContentCopyrightOwnerService; private LearningContentCopyrightOwnerService learningContentCopyrightOwnerService;
@Resource
private AuditService auditService;
@Resource
private AssetService assetService;
@Override @Override
public Page<Audit> getUserList(Page<Audit> page, TUser user) { public Page<Audit> getUserList(Page<Audit> page, TUser user) {
return page.setRecords(auditMapper.getUserList(page, user)); return page.setRecords(auditMapper.getUserList(page, user));
...@@ -259,8 +257,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements ...@@ -259,8 +257,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
final List<String> exhibitionBoardIdList = this.exhibitionBoardService.listObjs(queryWrapper, Object::toString); final List<String> exhibitionBoardIdList = this.exhibitionBoardService.listObjs(queryWrapper, Object::toString);
if (exhibitionBoardIdList != null && !exhibitionBoardIdList.isEmpty()) { if (exhibitionBoardIdList != null && !exhibitionBoardIdList.isEmpty()) {
this.exhibitionBoardService.removeByIds(exhibitionBoardIdList); this.exhibitionBoardService.removeByIds(exhibitionBoardIdList);
this.auditService.remove(Wrappers.<Audit>lambdaUpdate().in(Audit::getRefItemId, exhibitionBoardIdList)); this.auditMapper.delete(Wrappers.<Audit>lambdaUpdate().in(Audit::getRefItemId, exhibitionBoardIdList));
this.assetService.remove(Wrappers.<Asset>lambdaUpdate().in(Asset::getRefItemId, exhibitionBoardIdList)); this.assetMapper.delete(Wrappers.<Asset>lambdaUpdate().in(Asset::getRefItemId, exhibitionBoardIdList));
final LambdaQueryWrapper<LearningContentBoard> learningContentBoardLambdaQueryWrapper = Wrappers.<LearningContentBoard>lambdaQuery().in(LearningContentBoard::getExhibitionBoardCatId, exhibitionBoardIdList); final LambdaQueryWrapper<LearningContentBoard> learningContentBoardLambdaQueryWrapper = Wrappers.<LearningContentBoard>lambdaQuery().in(LearningContentBoard::getExhibitionBoardCatId, exhibitionBoardIdList);
final List<LearningContentBoard> learningContentBoardList = this.learningContentBoardService.list(learningContentBoardLambdaQueryWrapper); final List<LearningContentBoard> learningContentBoardList = this.learningContentBoardService.list(learningContentBoardLambdaQueryWrapper);
...@@ -279,8 +277,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements ...@@ -279,8 +277,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
this.learningContentBoardService.remove(deleteWrapper1); this.learningContentBoardService.remove(deleteWrapper1);
} }
} }
this.auditService.remove(Wrappers.<Audit>lambdaUpdate().in(Audit::getRefItemId, videoContentId)); this.auditMapper.delete(Wrappers.<Audit>lambdaUpdate().in(Audit::getRefItemId, videoContentId));
this.assetService.remove(Wrappers.<Asset>lambdaUpdate().in(Asset::getRefItemId, videoContentId)); this.assetMapper.delete(Wrappers.<Asset>lambdaUpdate().in(Asset::getRefItemId, videoContentId));
update = this.videoContentService.removeById(videoContentId); update = this.videoContentService.removeById(videoContentId);
break; break;
case ADD: case ADD:
...@@ -340,7 +338,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements ...@@ -340,7 +338,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
this.learningContentBoardService.remove(learningContentBoardLambdaUpdateWrapper); this.learningContentBoardService.remove(learningContentBoardLambdaUpdateWrapper);
} }
this.auditMapper.delete(Wrappers.<Audit>lambdaUpdate().eq(Audit::getRefItemId, exhibitionBoardId)); this.auditMapper.delete(Wrappers.<Audit>lambdaUpdate().eq(Audit::getRefItemId, exhibitionBoardId));
this.assetService.remove(Wrappers.<Asset>lambdaUpdate().eq(Asset::getRefItemId, exhibitionBoardId)); this.assetMapper.delete(Wrappers.<Asset>lambdaUpdate().eq(Asset::getRefItemId, exhibitionBoardId));
update = this.exhibitionBoardService.removeById(exhibitionBoardId); update = this.exhibitionBoardService.removeById(exhibitionBoardId);
break; break;
case ADD: case ADD:
......
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