Authored by caoyan

Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12

@@ -219,7 +219,10 @@ public class ErpGWOrderController { @@ -219,7 +219,10 @@ public class ErpGWOrderController {
219 @IgnoreSession 219 @IgnoreSession
220 @RequestMapping(value = "/findOrderGoods") 220 @RequestMapping(value = "/findOrderGoods")
221 public ApiResponse findOrderGoods(@RequestParam(value = "orderCodes") String orderCodes) { 221 public ApiResponse findOrderGoods(@RequestParam(value = "orderCodes") String orderCodes) {
222 - List<Long> orderCodeList = Splitter.on(",").trimResults().splitToList(orderCodes).stream() 222 + List<Long> orderCodeList = Splitter.on(",")
  223 + .trimResults()
  224 + .omitEmptyStrings()
  225 + .splitToList(orderCodes).stream()
223 .map(Long::valueOf) 226 .map(Long::valueOf)
224 .collect(Collectors.toList()); 227 .collect(Collectors.toList());
225 228