fix：“修复订单明细区分爆米花数据查全部的问题”

src/main/java/com/szwl/controller/TOrderController.java

@@ -207,16 +207,17 @@ public class TOrderController {
             }
             if (StringUtils.isNotEmpty(companyType)) {
                 if (companyType.equals("0")) {
-                    query.isNull(TOrder::getCompanyType).or()
-                            .eq(TOrder::getCompanyType, companyType);
+                    String finalCompanyType = companyType;
+                    query.nested(q -> q.isNull(TOrder::getCompanyType).or()
+                            .eq(TOrder::getCompanyType, finalCompanyType));
                 } else {
                     query.eq(TOrder::getCompanyType, companyType);
                 }
             }
             if (StringUtils.isNotEmpty(machineType)) {
                 if (machineType.equals("0")) {
-                    query.isNull(TOrder::getMachineType).or()
-                            .eq(TOrder::getMachineType, machineType);
+                    query.nested(q -> q.isNull(TOrder::getMachineType).or()
+                            .eq(TOrder::getMachineType, machineType));
                 } else {
                     query.eq(TOrder::getMachineType, machineType);
                 }
@@ -1518,16 +1519,17 @@ public class TOrderController {
             }
             if (StringUtils.isNotEmpty(companyType)) {
                 if (companyType.equals("0")) {
-                    query.isNull(TOrder::getCompanyType).or()
-                            .eq(TOrder::getCompanyType, companyType);
+                    String finalCompanyType = companyType;
+                    query.nested(q -> q.isNull(TOrder::getCompanyType).or()
+                            .eq(TOrder::getCompanyType, finalCompanyType));
                 } else {
                     query.eq(TOrder::getCompanyType, companyType);
                 }
             }
             if (StringUtils.isNotEmpty(machineType)) {
                 if (machineType.equals("0")) {
-                    query.isNull(TOrder::getMachineType).or()
-                            .eq(TOrder::getMachineType, machineType);
+                    query.nested(q -> q.isNull(TOrder::getMachineType).or()
+                            .eq(TOrder::getMachineType, machineType));
                 } else {
                     query.eq(TOrder::getMachineType, machineType);
                 }

src/main/java/com/szwl/model/excel/CoinOrderTarget.java

@@ -15,7 +15,7 @@ public class CoinOrderTarget {
     /**
      * 花型名称
      */
-    @Excel(name = "花型名称", width = 20.0D)
+    @Excel(name = "商品名称", width = 20.0D)
     private String productName;
 
     /**

src/main/java/com/szwl/model/excel/OrderTarget.java

@@ -17,7 +17,7 @@ public class OrderTarget {
     /**
      * 花型名称
      */
-    @Excel(name = "花型名称", width = 20.0D)
+    @Excel(name = "商品名称", width = 20.0D)
     private String productName;