Merge branch 'uat_partyMemberEvent' into uat_code
This commit is contained in:
@ -59,7 +59,7 @@ public class EventStyleServiceImpl extends ServiceImpl<EventStyleMapper, EventSt
|
|||||||
}
|
}
|
||||||
query.ne(EventStyle::getDeleteFlag, "1");
|
query.ne(EventStyle::getDeleteFlag, "1");
|
||||||
list = this.list(query);
|
list = this.list(query);
|
||||||
List<String> imageIdList = list.stream().map(EventStyle::getImage).distinct().collect(Collectors.toList());
|
List<String> imageIdList = list.stream().map(EventStyle::getImage).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList());
|
||||||
BaseResponse<List<DocumentDataVO>> queryReturn = documentCenterService.queryReturn(imageIdList);
|
BaseResponse<List<DocumentDataVO>> queryReturn = documentCenterService.queryReturn(imageIdList);
|
||||||
log.info("文档中心返回:{}", queryReturn.toString());
|
log.info("文档中心返回:{}", queryReturn.toString());
|
||||||
PartyEventExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess());
|
PartyEventExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess());
|
||||||
@ -189,7 +189,7 @@ public class EventStyleServiceImpl extends ServiceImpl<EventStyleMapper, EventSt
|
|||||||
style.setCreateTime(LocalDateTime.now());
|
style.setCreateTime(LocalDateTime.now());
|
||||||
style.setCreateBy(inVO.getCreateBy());
|
style.setCreateBy(inVO.getCreateBy());
|
||||||
style.setContentImageId(inVO.getContentImageId());
|
style.setContentImageId(inVO.getContentImageId());
|
||||||
|
style.setDeleteFlag("0");
|
||||||
return this.saveOrUpdate(style);
|
return this.saveOrUpdate(style);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user