优化筛选

src/main/java/com/izouma/nineth/service/AssetService.java

@@ -461,20 +461,16 @@ public class AssetService {
                     userHistory.setDescription("赠送");
                     break;
             }
-            Object operation1 = query.get("operation");
-            if (operation1!=null){
-                String operation = (String) operation1;
-                if (!userHistory.getOperation().equals(operation)) {
-                    return null;
-                }
-            }
+
             return userHistory;
         });
 
-        List<UserHistory> content = map.getContent();
-        if (content!=null&&content.size()>0){
+        Object operation1 = query.get("operation");
+        if (operation1!=null){
+            String operation = (String) operation1;
+            List<UserHistory> content = map.getContent();
             for (int i = 0; i < content.size(); i++) {
-                if (content.get(i)==null) {
+                if (!content.get(i).getDescription().equals(operation)){
                     content.remove(i);
                     i--;
                 }