|
@@ -645,7 +645,10 @@ public class AdminSalesOrderController {
|
|
|
String orderItemString
|
|
|
) throws Exception {
|
|
|
|
|
|
- salesOrder.setSalesAddressTel(salesOrder.getSalesAddressTel().trim());
|
|
|
+
|
|
|
+ if(salesOrder.getSalesAddressTel() != null && !"".equals(salesOrder.getSalesAddressTel())){
|
|
|
+ salesOrder.setSalesAddressTel(salesOrder.getSalesAddressTel().trim());
|
|
|
+ }
|
|
|
|
|
|
Admin admin = AdminUtils.getLoginAdmin();
|
|
|
ResponseJson rj = new ResponseJson();
|
|
@@ -810,7 +813,9 @@ public class AdminSalesOrderController {
|
|
|
String orderItemString
|
|
|
) throws Exception {
|
|
|
|
|
|
- salesOrder.setSalesAddressTel(salesOrder.getSalesAddressTel().trim());
|
|
|
+ if(salesOrder.getSalesAddressTel() != null && !"".equals(salesOrder.getSalesAddressTel())){
|
|
|
+ salesOrder.setSalesAddressTel(salesOrder.getSalesAddressTel().trim());
|
|
|
+ }
|
|
|
|
|
|
JSONArray jsonArray = JSONArray.fromObject(orderItemString);
|
|
|
List salesOrderItemList = ((List)JSONArray.toCollection(jsonArray, SalesOrderItem.class));
|