Merge branch 'feature-delay-add' into dev

336bdd96 · jiaorz · 1d9b37c5 · 87180832 · 336bdd96
Commit 336bdd96 authored Dec 04, 2019 by jiaorz
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

BaseOrderBiz.java ...c/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java +3 -1

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
@@ -366,7 +366,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
              orderPageVO.setDelayVehicleDetail(jsonArray.toJSONString());
              jsonArray = new JSONArray();
              dedDetailDTO = new DedDetailDTO();
-           }
+           } else {
+			   orderPageVO.setDelayVehicleDetail(jsonArray.toJSONString());
+		   }
 			/**
 			 * 提前还车
 			 */