Преглед на файлове

修改添加修改客诉的电话号码去空格处理

wangxiaoming преди 6 години
родител
ревизия
f641378a04
променени са 1 файла, в които са добавени 7 реда и са изтрити 2 реда
  1. 7 2
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

+ 7 - 2
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -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));