ES

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

@@ -141,7 +141,7 @@ public class OrderBaseEsLogic {
             page.setCurrent(zfireParamBean.getPageNum());
             page.setSize(zfireParamBean.getPageSize());
             page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
-        }
+        }else
 
         if (year.equals("2024")) {
             SearchHits<OrderBase2024Es> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBase2024Es.class);
@@ -156,7 +156,7 @@ public class OrderBaseEsLogic {
             page.setCurrent(zfireParamBean.getPageNum());
             page.setSize(zfireParamBean.getPageSize());
             page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
-        }
+        }else
 
 
         if (year.equals("2022") || Convert.toInt(year) < 2022) {
@@ -848,7 +848,7 @@ public class OrderBaseEsLogic {
             }
 
             orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS,OrderBaseVO.class);
-        }
+        }else
 
         if (year.equals("2024")) {
 
@@ -896,7 +896,7 @@ public class OrderBaseEsLogic {
             }
 
             orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS,OrderBaseVO.class);
-        }
+        }else
 
 
         if (year.equals("2022") || Convert.toInt(year) < 2022) {