no message

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

@@ -700,7 +700,7 @@ public class OrderBaseEsLogic {
             return response;
         }
 
-        if (year.equals("2022") || Convert.toInt(year) < 2022) {
+        if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
             SearchHits response = elasticsearchRestTemplate.search(searchQuery, OrderBase2022Es.class);
             return response;
         }else {

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1775,7 +1775,7 @@
                     pg_order_operator_log${year}
                 <where>
                     <if test="ids != null and ids.size > 0">
-                        AND a.websit_id IN
+                        AND order_base_id IN
                         <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
                             #{item}
                         </foreach>