no message

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

@@ -3,7 +3,6 @@ package com.gree.mall.manager.logic.workorder;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,12 +27,11 @@ import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
@@ -336,7 +334,7 @@ public class ChangeOrderLogic {
             return pgOrderProductDetails;
         }
 
-        if (year.equals("2022") || Convert.toInt(year) < 2022) {
+        if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
             List<PgOrderProductDetail2022> list = pgOrderProductDetail2022Service.lambdaQuery().eq(PgOrderProductDetail2022::getOrderBaseId, id)
                     .in(!CollectionUtils.isEmpty(status), PgOrderProductDetail2022::getStatus, status).list();
             List<PgOrderProductDetail> pgOrderProductDetails = BeanUtil.copyToList(list, PgOrderProductDetail.class);
@@ -360,7 +358,7 @@ public class ChangeOrderLogic {
             return this.productDetail2023(id);
         }
 
-        if (year.equals("2022") || Convert.toInt(year) < 2022) {
+        if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
             return this.productDetail2022(id);
 
         }
@@ -467,7 +465,7 @@ public class ChangeOrderLogic {
                 workerOrder.setPgOrderBase(BeanUtil.toBean(pgOrderBase,PgOrderBase.class));
             }
 
-            if (year.equals("2022") || Convert.toInt(year) < 2022) {
+            if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
                 PgOrderBase2022 pgOrderBase = pgOrderBase2022Service.getById(workerOrderId);
                 workerOrder.setPgOrderBase(BeanUtil.toBean(pgOrderBase,PgOrderBase.class));