2

src/main/java/common/repository/ContractRepository.java

@@ -33,7 +33,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
     @Query(value="SELECT * from contract where platform = ?1 and email = ?2 and type = ?3",nativeQuery=true)
     List<Contract> findByPlatformAndEmail(String platform, String email, String type);
 
-    @Query(value="SELECT * from contract where platform = ?1 and email = ?2 and type = ?3 order by ds desc limit 1",nativeQuery=true)
+    @Query(value="SELECT * from contract where platform = ?1 and email = ?2 and type = ?3 order by ds,end_date desc limit 1",nativeQuery=true)
     Contract findByPlatformAndEmailLimit1(String platform, String email,String type);
 
     @Query(value="SELECT * from contract where platform = ?1 and email = ?2 and type = ?3 and price_level = ?4 order by ds desc limit 1",nativeQuery=true)