Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-service/src/main/java/com/iamberry/rst/util/CustomerCommonUtil.java

@@ -76,8 +76,8 @@ public class CustomerCommonUtil {
                 repair.setRepairIsTransfer(c.getRelationIsTransfer());
                 repair.setRepairCreateTime(c.getRelationCreateTime());
                 repair.setRepairUpdateTime(c.getRelationUpdateTime());
-                repair.setRepairFactoryCosts(c.getRelationFactoryCosts()*100);
-                repair.setRepairCustomerCosts(c.getRelationCustomerCosts()*100);
+                repair.setRepairFactoryCosts(c.getRelationFactoryCosts() == null ? null : c.getRelationFactoryCosts()*100);
+                repair.setRepairCustomerCosts(c.getRelationCustomerCosts() == null ? null : c.getRelationCustomerCosts()*100);
                 return repair;
             case 5://补发
                 Reissue reissue = new Reissue();