Commit 01ad3787 by 田超

Merge branch 'fixbug/getQrcodeDetail4Erp' into 'master'

bug: [none] 二维码资源问题

See merge request rays/pcloud-book!1288
parents b73b8e65 5b56082f
...@@ -3202,17 +3202,19 @@ public class BookBizImpl implements BookBiz { ...@@ -3202,17 +3202,19 @@ public class BookBizImpl implements BookBiz {
if(sceneId != null && sceneId > 0){ if(sceneId != null && sceneId > 0){
QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(sceneId); QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(sceneId);
List<MessageDto> messages = qrcodeSceneDto.getMessages(); if(qrcodeSceneDto != null){
if(!CollectionUtils.isEmpty(messages)){ List<MessageDto> messages = qrcodeSceneDto.getMessages();
QrcodeServeDto qrcodeServeDto; if(!CollectionUtils.isEmpty(messages)){
for (MessageDto message : messages) { QrcodeServeDto qrcodeServeDto;
qrcodeServeDto = new QrcodeServeDto(); for (MessageDto message : messages) {
qrcodeServeDto.setServeId(message.getFromId()); qrcodeServeDto = new QrcodeServeDto();
qrcodeServeDto.setServeType(message.getTypeCode()); qrcodeServeDto.setServeId(message.getFromId());
qrcodeServeDto.setServeUrl(message.getUrl()); qrcodeServeDto.setServeType(message.getTypeCode());
qrcodeServeDto.setTypeCode(message.getFromType()); qrcodeServeDto.setServeUrl(message.getUrl());
qrcodeServeDto.setSceneId(sceneId); qrcodeServeDto.setTypeCode(message.getFromType());
qrcodeServeDtoList.add(qrcodeServeDto); qrcodeServeDto.setSceneId(sceneId);
qrcodeServeDtoList.add(qrcodeServeDto);
}
} }
} }
} }
......
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