Merge branch 'release' into test

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java

@@ -292,9 +292,13 @@ public class BuyerServiceImpl implements BuyerService {
         resultMap.put("list", list);
 //        }
         log.info("{}数据库插入耗时:{}", LOGGER_MSG, (System.currentTimeMillis() - t3));
-
+        if (ObjectUtil.isNotEmpty(list)) {
+            resultMap.put(OrderManagementConstant.DATA, resultMap);
+            result.put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999)
+                    .put(OrderManagementConstant.MESSAGE, "上传存在失败客户信息");
+        }
         return result.put(OrderManagementConstant.DATA, resultMap).put("count", importSuccessCount)
-                .put("importResult", "导入数据共" + buyerEntitys.size() + "条,成功" + importSuccessCount + "条");
+                .put("importResult", "导入数据共" + buyerEntityList.size() + "条,成功" + importSuccessCount + "条");
     }
 
     @Override