From 8ce789d64b1a88a4c8c2f3fe8cd8d55539673d4e Mon Sep 17 00:00:00 2001
From: suncz <suncz@izpec.com>
Date: Wed, 29 May 2024 08:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E8=AF=B7=E6=B1=82=E6=9D=A1?=
 =?UTF-8?q?=E7=9B=AE=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9=E3=80=81=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vverp/controller/admin/MaterialOrderController.java    | 2 +-
 src/main/java/com/vverp/service/MaterialOrderService.java  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/vverp/controller/admin/MaterialOrderController.java b/src/main/java/com/vverp/controller/admin/MaterialOrderController.java
index a09db7e..b653180 100644
--- a/src/main/java/com/vverp/controller/admin/MaterialOrderController.java
+++ b/src/main/java/com/vverp/controller/admin/MaterialOrderController.java
@@ -748,7 +748,7 @@ public class MaterialOrderController extends BaseController {
 //            map.put("loadFlag", false);
 //        }
 
-        int pageSize = 100;
+        int pageSize = 1000;
         Pageable pageable = new Pageable();
         pageable.setPageNumber(nowSize / pageSize + 1);
         pageable.setPageSize(pageSize);
diff --git a/src/main/java/com/vverp/service/MaterialOrderService.java b/src/main/java/com/vverp/service/MaterialOrderService.java
index 3996235..63b3a7c 100644
--- a/src/main/java/com/vverp/service/MaterialOrderService.java
+++ b/src/main/java/com/vverp/service/MaterialOrderService.java
@@ -2,6 +2,7 @@ package com.vverp.service;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.comparator.CompareUtil;
 import com.vverp.base.exception.ImportExcelException;
 import com.vverp.dao.MaterialOrderDao;
 import com.vverp.dto.CellDto;
@@ -897,7 +898,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
 
                             MaterialOrderItem item = new MaterialOrderItem();
 
-                            if ("".equals(bigType) || productTypeMap.getOrDefault(bigType, null) == null) {
+                            if (bigType.isEmpty() || productTypeMap.getOrDefault(bigType, null) == null) {
 //                                ProductType productType = new ProductType();
 //                                productType.setName(bigType);
 //                                productType.setLevel(1);
@@ -916,7 +917,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
                                 item.setBigProductDes( productTypeMap.get(bigType).getTypeDescribe());
                             }
 
-                            if (smallType.equals("") || productTypeMap.getOrDefault(smallType, null) == null) {
+                            if (smallType.isEmpty() || productTypeMap.getOrDefault(smallType, null) == null) {
 //                                throw new RuntimeException(smallType+"小类不存在");
 //                                ProductType parent = productTypeMap.get(bigType);
 //                                ProductType productType = new ProductType();
@@ -961,7 +962,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
                                     Long productTypeId = product.getProductType().getId();
                                     if (!smallType.equals("")) {
                                         product.setProductType(productTypeMap.get(smallType));
-                                    }else {
+                                    }else if(!bigType.equals("")){
                                         product.setProductType(productTypeMap.get(bigType));
                                     }
                                     if (!productTypeId.equals(product.getProductType().getId())) {