فهرست منبع

处理推荐询价数据为空导出异常的bug

hejq 8 سال پیش
والد
کامیت
95e5a75e33
1فایلهای تغییر یافته به همراه4 افزوده شده و 2 حذف شده
  1. 4 2
      src/main/java/com/uas/platform/b2b/controller/PubInquiryListController.java

+ 4 - 2
src/main/java/com/uas/platform/b2b/controller/PubInquiryListController.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -173,14 +174,15 @@ public class PubInquiryListController {
             modelAndView.addObject("state", "我的客户询价");
             List<Long> uuList = customerService.getCustomerDistribute();
             if (CollectionUtils.isEmpty(uuList)) {
-                uuList.add(0l);
+                uuList.add(0L);
             }
             modelAndView.addObject("data", enquiryService.fingByPageInfo(pageInfo, filter, uuList).getContent());
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/publicInquiry", "客户公共询价列表"));
             logger.log("公共询价单", "导出Excel列表", "导出我的客户询价列表");
         } else if (state.equals("remind")){
             modelAndView.addObject("state", "推荐报价列表");
-            modelAndView.addObject("data", InquiryUtils.getRemind(pageInfo, filter, SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu()).getContent());
+            List<InquiryRemind> reminds = InquiryUtils.getRemind(pageInfo, filter, SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu()).getContent();
+            modelAndView.addObject("data", !CollectionUtils.isEmpty(reminds) ? reminds : new ArrayList<InquiryRemind>());
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/inquiryRemind", "推荐报价列表"));
             logger.log("公共询价单", "导出Excel列表", "导出推荐报价列表");
         }