Merge remote-tracking branch 'origin/dev-dividend' into dev-dividend

asset_pool/asset_optimize.py

@@ -173,13 +173,15 @@ class FundDividendSortinoAssetOptimize(SortinoAssetOptimize):
             exclude = f.get('exclude')
             volatility = f.get('volatility')
             records = [fund for fund in funds if fund['customType'] == customType and fund['id'] in annual.keys()]
+            records = sorted(records, key=lambda x: annual[x['id']])
             if exclude is not None:
                 exclude = exclude if len(records) > exclude else len(records)
                 if exclude > 0:
-                    records = records[:len(records) - exclude]
+                    filtered.extend(records[-exclude:])
+                    records = records[:- exclude]
             if volatility is not None:
                 records = [record for record in records if annual.get(record['id']) > volatility]
-            filtered.extend(records)
+                filtered.extend(records)
         for f in filtered:
             funds.remove(f)
         return funds