2 Commits d8704dbde0 ... 14af0786dc

Author SHA1 Message Date
  liyuan 14af0786dc Merge remote-tracking branch 'origin/master' 6 days ago
  liyuan cd54699d80 大屏数据问题优化 6 days ago

+ 4 - 2
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/smartLargeScreenApi/service/impl/ApiServiceImpl.java

@@ -957,8 +957,9 @@ public class ApiServiceImpl implements ApiService {
 			List<TyreSaleBrand> itemsList = saleBrandList.stream()
 				.sorted(Comparator.comparing(TyreSaleBrand::getNumber).reversed())
 				.collect(Collectors.toList());
+			int itemSize = Math.min(itemsList.size() - 1, 4);
 			List<TyreSaleBrand> brandList = new ArrayList<>();
-			for (int i = 0; i <= 4; i++) {
+			for (int i = 0; i <= itemSize; i++) {
 				brandList.add(itemsList.get(i));
 			}
 			for (TyreSaleBrand item : brandList) {
@@ -992,8 +993,9 @@ public class ApiServiceImpl implements ApiService {
 			List<TyreSaleBrand> itemsList = saleBrandList.stream()
 				.sorted(Comparator.comparing(TyreSaleBrand::getNumber).reversed())
 				.collect(Collectors.toList());
+			int itemSize = Math.min(itemsList.size() - 1, 4);
 			List<TyreSaleBrand> brandList = new ArrayList<>();
-			for (int i = 0; i <= 4; i++) {
+			for (int i = 0; i <= itemSize; i++) {
 				brandList.add(itemsList.get(i));
 			}
 			for (TyreSaleBrand item : brandList) {