提交 f2eda67c authored 作者: Whispa's avatar Whispa

commit

上级 28982f3d
...@@ -10,7 +10,6 @@ import com.google.api.client.util.Base64; ...@@ -10,7 +10,6 @@ import com.google.api.client.util.Base64;
import com.google.api.client.util.StringUtils; import com.google.api.client.util.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -73,7 +72,7 @@ public class PostController { ...@@ -73,7 +72,7 @@ public class PostController {
//Optional<User> byId = userRepository.findById(id); //Optional<User> byId = userRepository.findById(id);
//if( !byId.isPresent() ) return new ArrayList<>(); //if( !byId.isPresent() ) return new ArrayList<>();
Optional<Hashtag> byName = hashtagRepository.findByName(tag); Optional<Hashtag> byName = hashtagRepository.findFirstByName(tag);
if (!byName.isPresent()) return new ArrayList<>(); if (!byName.isPresent()) return new ArrayList<>();
return repository.findAllByOrderByCreateDateDesc(byName.get(), PageRequest.of(pageNo, pageSize)).toList(); return repository.findAllByOrderByCreateDateDesc(byName.get(), PageRequest.of(pageNo, pageSize)).toList();
...@@ -253,7 +252,7 @@ public class PostController { ...@@ -253,7 +252,7 @@ public class PostController {
if (hashtags != null) { if (hashtags != null) {
for (Hashtag hashtag : hashtags) { for (Hashtag hashtag : hashtags) {
Optional<Hashtag> byName = hashtagRepository.findByName(hashtag.getName()); Optional<Hashtag> byName = hashtagRepository.findFirstByName(hashtag.getName());
hashtag = hashtagRepository.existsByName(hashtag.getName()) && byName.isPresent() ? hashtag = hashtagRepository.existsByName(hashtag.getName()) && byName.isPresent() ?
byName.get() : byName.get() :
hashtag; hashtag;
......
...@@ -9,7 +9,7 @@ import java.util.Optional; ...@@ -9,7 +9,7 @@ import java.util.Optional;
public interface HashtagRepository extends PagingAndSortingRepository<Hashtag,String> { public interface HashtagRepository extends PagingAndSortingRepository<Hashtag,String> {
boolean existsByName(String name); boolean existsByName(String name);
Optional<Hashtag> findByName(String name); Optional<Hashtag> findFirstByName(String name);
Page<Hashtag> findAllByNameContaining(String name, Pageable pageable); Page<Hashtag> findAllByNameContaining(String name, Pageable pageable);
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论