liaijie 3 лет назад
Родитель
Сommit
b32dbff5de
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      src/main/java/com/izouma/nineth/service/AssetService.java

+ 3 - 2
src/main/java/com/izouma/nineth/service/AssetService.java

@@ -440,7 +440,6 @@ public class AssetService {
         Set<String> tokenIds = page.stream().map(TokenHistory::getTokenId).collect(Collectors.toSet());
         List<Asset> assets = tokenIds.isEmpty() ? new ArrayList<>() : assetRepo.findByTokenIdIn(tokenIds);
         Map<String, Object> query = pageQuery.getQuery();
-        String operation = (String) query.get("operation");
 
         Page<UserHistory> map = page.map(tokenHistory -> {
             UserHistory userHistory = new UserHistory();
@@ -462,7 +461,9 @@ public class AssetService {
                     userHistory.setDescription("赠送");
                     break;
             }
-            if (operation != null && operation != "") {
+            Object operation1 = query.get("operation");
+            if (operation1!=null){
+                String operation = (String) operation1;
                 if (!userHistory.getOperation().equals(operation)) {
                     return null;
                 }