xushengqiang 6 роки тому
батько
коміт
b58ee2b768

+ 8 - 1
src/main/java/cn/efunbox/audio/impl/AudioServiceImpl.java

@@ -6,6 +6,7 @@ import cn.efunbox.audio.entity.Audio;
 import cn.efunbox.audio.repository.AlbumRepo;
 import cn.efunbox.audio.repository.AudioRepo;
 import cn.efunbox.audio.service.AudioService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
@@ -73,7 +74,9 @@ public class AudioServiceImpl implements AudioService {
             Album album = albumMap.get(audio.getAlbumId());
             if (Objects.nonNull(album)) {
                 audio.setAlbum(album.getName());
-                audio.setAlbumImage(imgURL + album.getImage());
+                if (StringUtils.isNotBlank(album.getImage())) {
+                    audio.setAlbumImage(imgURL + album.getImage());
+                }
             }
         });
 
@@ -89,6 +92,7 @@ public class AudioServiceImpl implements AudioService {
             list = audioRepo.findByMediaTypeAndIdGroup(mediaType, idGroup, pageable);
         else
             list = audioRepo.findByIdGroup(idGroup, pageable);
+        fillAlbum(list.getContent());
         return list;
     }
 
@@ -107,6 +111,7 @@ public class AudioServiceImpl implements AudioService {
             list = audioRepo.findByNameLike(name);
             System.out.println("list:"+list.toString());
         }
+        fillAlbum(list);
 //        System.out.println("list2:"+list.toString());
         return list;
     }
@@ -121,6 +126,7 @@ public class AudioServiceImpl implements AudioService {
             list = audioRepo.findByMediaTypeAndAlbumIdIn(mediaType, albumIds);
         else
             list = audioRepo.findByAlbumIdIn(albumIds);
+        fillAlbum(list);
         return list;
     }
 
@@ -138,6 +144,7 @@ public class AudioServiceImpl implements AudioService {
         if(CollectionUtils.isEmpty(list))
             list = audioRepo.findByNameLikeAndAlbumIdIn(name, albumIds);
 
+        fillAlbum(list);
         return list;
     }