FengChaoYu 3 ヶ月 前
コミット
f92ea696ea

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -159,7 +159,7 @@ public class OrderBaseEsLogic {
         }else
 
 
-        if (year.equals("2022") || Convert.toInt(year) < 2022) {
+        if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
             SearchHits<OrderBase2022Es> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBase2022Es.class);
             SearchPage<OrderBase2022Es> searchHits2022 = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
 
@@ -936,7 +936,7 @@ public class OrderBaseEsLogic {
         }else
 
 
-        if (year.equals("2022") || Convert.toInt(year) < 2022) {
+        if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
 
             List<OrderBase2022Es> orderBaseVOS = new ArrayList<>();
             SearchScrollHits<OrderBase2022Es> scrollHits = elasticsearchRestTemplate.searchScrollStart(